aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-09 13:20:38 +0000
committerMike Frysinger <vapier@gentoo.org>2008-11-09 13:20:38 +0000
commit04f2f48f8b4fd7d1765ad8b071b3242f09f28567 (patch)
tree437b2fc3e66a0544763d3fbaffec8029079aa731 /libsbutil/get_sandbox_lib.c
parentsandbox: unify banner message and drop "linux" from it (diff)
downloadsandbox-04f2f48f8b4fd7d1765ad8b071b3242f09f28567.tar.gz
sandbox-04f2f48f8b4fd7d1765ad8b071b3242f09f28567.tar.bz2
sandbox-04f2f48f8b4fd7d1765ad8b071b3242f09f28567.zip
libsbutil: make sure we always let the ldso do the libsandbox search
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'libsbutil/get_sandbox_lib.c')
-rw-r--r--libsbutil/get_sandbox_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libsbutil/get_sandbox_lib.c b/libsbutil/get_sandbox_lib.c
index 762ed1d..da88724 100644
--- a/libsbutil/get_sandbox_lib.c
+++ b/libsbutil/get_sandbox_lib.c
@@ -13,12 +13,12 @@
#include "headers.h"
#include "sbutil.h"
+/* Always let the dynamic loader do the searching rather than hard coding the
+ * full path. This way, things like multilib, testing, local runs work easier.
+ */
void get_sandbox_lib(char *path)
{
save_errno();
- snprintf(path, SB_PATH_MAX, "%s/%s", LIBSANDBOX_PATH, LIB_NAME);
- if (!rc_file_exists(path)) {
- snprintf(path, SB_PATH_MAX, "%s", LIB_NAME);
- }
+ snprintf(path, SB_PATH_MAX, "%s", LIB_NAME);
restore_errno();
}