[SCM] UID Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Wed Oct 1 09:17:33 MDT 2014


The branch, master has been updated
       via  ba53521 uwrap: Fix the handle loop for older gcc versions.
      from  45b044d TESTS: SYS_gettimeofday behaves differently on OS X

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


- Log -----------------------------------------------------------------
commit ba5352114b7f8783455633f8086b97113e91b5c4
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 1 17:17:43 2014 +0200

    uwrap: Fix the handle loop for older gcc versions.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/src/uid_wrapper.c b/src/uid_wrapper.c
index 2181767..c1dc56b 100644
--- a/src/uid_wrapper.c
+++ b/src/uid_wrapper.c
@@ -271,11 +271,14 @@ static void *uwrap_load_lib_handle(enum uwrap_lib lib)
 	case UWRAP_LIBC:
 		handle = uwrap.libc.handle;
 		if (handle == NULL) {
-			for (handle = NULL, i = 10; handle == NULL && i >= 0; i--) {
+			for (i = 10; i >= 0; i--) {
 				char soname[256] = {0};
 
 				snprintf(soname, sizeof(soname), "libc.so.%d", i);
 				handle = dlopen(soname, flags);
+				if (handle != NULL) {
+					break;
+				}
 			}
 
 			uwrap.libc.handle = handle;


-- 
UID Wrapper Repository


More information about the samba-cvs mailing list