[SCM] NSS Wrapper Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  7d26793 nwrap: Fall back to RTLD_NEXT if we can't find libc.
      from  fa20a56 tests: getaddrinfo() should use 0 as ai_flags.

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


- Log -----------------------------------------------------------------
commit 7d26793e9cc99b3eb55fe627a4b6287e7dae37ee
Author: Andreas Schneider <a...@samba.org>
Date:   Tue Apr 29 15:10:00 2014 +0200

    nwrap: Fall back to RTLD_NEXT if we can't find libc.
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Michael Adam <ob...@samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index 7c5a413..6ed48c6 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -562,10 +562,6 @@ static void *nwrap_load_lib_handle(enum nwrap_lib lib)
        void *handle = NULL;
        int i;
 
-#ifdef HAVE_APPLE
-       return RTLD_NEXT;
-#endif
-
 #ifdef RTLD_DEEPBIND
        flags |= RTLD_DEEPBIND;
 #endif
@@ -619,10 +615,17 @@ static void *nwrap_load_lib_handle(enum nwrap_lib lib)
        }
 
        if (handle == NULL) {
+#ifdef RTLD_NEXT
+               handle = nwrap_main_global->libc->handle
+                      = nwrap_main_global->libc->sock_handle
+                      = nwrap_main_global->libc->nsl_handle
+                      = RTLD_NEXT;
+#else
                NWRAP_LOG(NWRAP_LOG_ERROR,
                          "Failed to dlopen library: %s\n",
                          dlerror());
                exit(-1);
+#endif
        }
 
        return handle;


-- 
NSS Wrapper Repository