From: Andreas Schneider <asn@samba.org>
Date: Thu, 31 Jul 2014 08:13:40 +0000 (+0200)
Subject: uwrap: Fall back to RTLD_NEXT if we can't find libc.
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=9711f77313e6d72696b0807acfea5d41ff89dfa7;p=obnox%2Fsamba%2Fsamba-obnox.git

uwrap: Fall back to RTLD_NEXT if we can't find libc.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/lib/uid_wrapper/uid_wrapper.c b/lib/uid_wrapper/uid_wrapper.c
index b77aa023ece..e9c7d5a94ea 100644
--- a/lib/uid_wrapper/uid_wrapper.c
+++ b/lib/uid_wrapper/uid_wrapper.c
@@ -194,10 +194,6 @@ static void *uwrap_load_lib_handle(enum uwrap_lib lib)
 	void *handle = NULL;
 	int i;
 
-#ifdef HAVE_APPLE
-	return RTLD_NEXT;
-#endif
-
 #ifdef RTLD_DEEPBIND
 	flags |= RTLD_DEEPBIND;
 #endif
@@ -223,10 +219,14 @@ static void *uwrap_load_lib_handle(enum uwrap_lib lib)
 	}
 
 	if (handle == NULL) {
+#ifdef RTLD_NEXT
+		handle = uwrap.libc.handle = RTLD_NEXT;
+#else
 		fprintf(stderr,
 			"Failed to dlopen library: %s\n",
 			dlerror());
 		exit(-1);
+#endif
 	}
 
 	return handle;