[SCM] Socket Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  38823ac swrap: Fix loading of system libraries.
      from  1e413ec echo_srv: Add missing includes.

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


- Log -----------------------------------------------------------------
commit 38823ac68e44c8084c98c8b869fb8b37abc38664
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Dec 20 13:38:19 2013 +0100

    swrap: Fix loading of system libraries.

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

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


Changeset truncated at 500 lines:

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 62e83ef..dc6ffb1 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -391,6 +391,7 @@ static void *swrap_load_lib_handle(enum swrap_lib lib)
 		/* FALL TROUGH */
 	case SWRAP_LIBSOCKET:
 #ifdef HAVE_LIBSOCKET
+		handle = swrap.libsocket_handle;
 		if (handle == NULL) {
 			for (handle = NULL, i = 10; handle == NULL && i >= 0; i--) {
 				char soname[256] = {0};
@@ -400,13 +401,12 @@ static void *swrap_load_lib_handle(enum swrap_lib lib)
 			}
 
 			swrap.libsocket_handle = handle;
-		} else {
-			handle = swrap.libsocket_handle;
 		}
 		break;
 #endif
 		/* FALL TROUGH */
 	case SWRAP_LIBC:
+		handle = swrap.libc_handle;
 		if (handle == NULL) {
 			for (handle = NULL, i = 10; handle == NULL && i >= 0; i--) {
 				char soname[256] = {0};
@@ -416,8 +416,6 @@ static void *swrap_load_lib_handle(enum swrap_lib lib)
 			}
 
 			swrap.libc_handle = handle;
-		} else {
-			handle = swrap.libc_handle;
 		}
 		break;
 	}


-- 
Socket Wrapper Repository