jail: improve some logs

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

diff --git a/jail/fs.c b/jail/fs.c
index f390180699f3d91fb53e01d594144ef9404ff440..c4cdcc93d6cdfb5c2329468e6929ca12a3cbe81c 100644 (file)
--- a/jail/fs.c
+++ b/jail/fs.c
@@ -86,7 +86,7 @@ static int add_script_interp(const char *path, const char *map, int size)
                start++;
        }
        if (start >= size) {
-               ERROR("bad script interp (%s)", path);
+               ERROR("bad script interp (%s)\n", path);
                return -1;
        }
        int stop = start + 1;
@@ -94,7 +94,7 @@ static int add_script_interp(const char *path, const char *map, int size)
                stop++;
        }
        if (stop >= size || (stop-start) > PATH_MAX) {
-               ERROR("bad script interp (%s)", path);
+               ERROR("bad script interp (%s)\n", path);
                return -1;
        }
        char buf[PATH_MAX];

diff --git a/jail/jail.c b/jail/jail.c
index 03ff66cb525fb3a859d4695a8d6e472b767ec204..b3f27d3d715a9ee87e1f5b0342fc012c29c91163 100644 (file)
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -76,7 +76,7 @@ static int mkdir_p(char *dir, mode_t mask)
                return 0;
 
        if (ret)
-               ERROR("mkdir failed on %s: %s\n", dir, strerror(errno));
+               ERROR("mkdir(%s, %d) failed: %s\n", dir, mask, strerror(errno));
 
        return ret;
 }
@@ -100,7 +100,7 @@ int mount_bind(const char *root, const char *path, int readonly, int error)
                snprintf(new, sizeof(new), "%s%s", root, path);
                fd = creat(new, 0644);
                if (fd == -1) {
-                       ERROR("failed to create %s: %s\n", new, strerror(errno));
+                       ERROR("creat(%s) failed: %s\n", new, strerror(errno));
                        return -1;
                }
                close(fd);
@@ -116,7 +116,7 @@ int mount_bind(const char *root, const char *path, int readonly, int error)
                return -1;
        }
 
-       DEBUG("mount -B %s %s\n", path, new);
+       DEBUG("mount -B %s %s (%s)\n", path, new, readonly?"ro":"rw");
 
        return 0;
 }
@@ -125,7 +125,7 @@ static int build_jail_fs(void)
 {
        char jail_root[] = "/tmp/ujail-XXXXXX";
        if (mkdtemp(jail_root) == NULL) {
-               ERROR("mkdtemp(jail_root) failed: %s\n", strerror(errno));
+               ERROR("mkdtemp(%s) failed: %s\n", jail_root, strerror(errno));
                return -1;
        }
 
@@ -135,7 +135,7 @@ static int build_jail_fs(void)
        }
 
        if (chdir(jail_root)) {
-               ERROR("failed to chdir() in the jail root\n");
+               ERROR("chdir(%s) (jail_root) failed: %s\n", jail_root, strerror(errno));
                return -1;
        }
 
@@ -149,11 +149,11 @@ static int build_jail_fs(void)
        mkdir(dirbuf, 0755);
 
        if (pivot_root(jail_root, dirbuf) == -1) {
-               ERROR("pivot_root failed: %s\n", strerror(errno));
+               ERROR("pivot_root(%s, %s) failed: %s\n", jail_root, dirbuf, strerror(errno));
                return -1;
        }
        if (chdir("/")) {
-               ERROR("chdir(/) failed: %s\n", strerror(errno));
+               ERROR("chdir(/) (after pivot_root) failed: %s\n", strerror(errno));
                return -1;
        }