ujail: remove some debug/dev hack

this code is present since first ujail commit (dfcfcca7)

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

diff --git a/jail/elf.c b/jail/elf.c
index c3a392c775b71cab2218381abfc9ff63166d25e3..7c52880c16eea765cc4e4fdeed2cc608ff86957d 100644 (file)
--- a/jail/elf.c
+++ b/jail/elf.c
@@ -100,17 +100,12 @@ const char* find_lib(const char *file)
 {
        struct library *l;
        static char path[PATH_MAX];
-       const char *p;
 
        l = avl_find_element(&libraries, file, l, avl);
        if (!l)
                return NULL;
 
-       p = l->path;
-       if (strstr(p, "local"))
-               p = "/lib";
-
-       snprintf(path, sizeof(path), "%s/%s", p, file);
+       snprintf(path, sizeof(path), "%s/%s", l->path, file);
 
        return path;
 }

diff --git a/jail/jail.c b/jail/jail.c
index b7e69464b4f0203a78ce3e3f0dbbd8a5c8fe8710..f62d121b9f1680c593a996a67b3f129f5b80cf7c 100644 (file)
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -92,21 +92,17 @@ static int mkdir_p(char *dir, mode_t mask)
 
 static int mount_bind(const char *root, const char *path, const char *name, int readonly, int error)
 {
-       const char *p = path;
        struct stat s;
        char old[PATH_MAX];
        char new[PATH_MAX];
        int fd;
 
-       if (strstr(p, "local"))
-               p = "/lib";
-
        snprintf(old, sizeof(old), "%s/%s", path, name);
-       snprintf(new, sizeof(new), "%s%s", root, p);
+       snprintf(new, sizeof(new), "%s%s", root, path);
 
        mkdir_p(new, 0755);
 
-       snprintf(new, sizeof(new), "%s%s/%s", root, p, name);
+       snprintf(new, sizeof(new), "%s%s/%s", root, path, name);
 
        if (stat(old, &s)) {
                ERROR("%s does not exist\n", old);