From: Etienne CHAMPETIER <champetier.etienne@gmail.com>
Date: Fri, 27 Nov 2015 16:27:12 +0000 (+0000)
Subject: ujail: remove some debug/dev hack
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=77403289b83c91233c07b1c226db508bb9be8c58;p=oweals%2Fprocd.git

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 c3a392c..7c52880 100644
--- 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 b7e6946..f62d121 100644
--- 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);