[SCM] UID Wrapper Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  690da04 uwrap: Fall back to RTLD_NEXT if we can't find libc.
      from  f4df629 uwrap: Add mutex in uwrap_destructor().

http://gitweb.samba.org/?p=uid_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 690da04acae08facfacb476f80c06a8f58b3cfef
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 29 15:11:40 2014 +0200

    uwrap: Fall back to RTLD_NEXT if we can't find libc.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 src/uid_wrapper.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/src/uid_wrapper.c b/src/uid_wrapper.c
index b77aa02..e9c7d5a 100644
--- a/src/uid_wrapper.c
+++ b/src/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;


-- 
UID Wrapper Repository