[SCM] Samba Shared Repository - branch v4-3-test updated

Karolin Seeger kseeger at samba.org
Wed Sep 16 10:44:02 UTC 2015


The branch, v4-3-test has been updated
       via  8aaba4b nss_winbind: fix hang on Solaris on big groups
       via  338bee2 build: use as-needed linker flag also on OpenBSD
      from  a4ec232 VERSION: Bump version up to 4.3.1...

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test


- Log -----------------------------------------------------------------
commit 8aaba4b38ed9df2c1ebaed693718b7787cb12003
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Sep 10 14:35:32 2015 +0200

    nss_winbind: fix hang on Solaris on big groups
    
    The problem with large groups on Solaris in the the NSS winbind module is
    Solaris wants the return value to be NSS_UNAVAIL if the buffer given is too
    small for getgrnam_r.  The current code return NSS_TRYAGAIN which causes
    Solaris/Illumos to loop without trying to resize the buffer.
    
    Thanks to  Nathan Huff <nhuff at acm.org> for finding this out.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10365
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Ralph Böhme <rb at sernet.de>
    (cherry picked from commit d3e51b9cfe3d56530253571e020af72da1877044)
    
    Autobuild-User(v4-3-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-3-test): Wed Sep 16 12:43:30 CEST 2015 on sn-devel-104

commit 338bee2ecffe518510c53aa6adb1b7a24f8b7867
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Sep 10 21:31:03 2015 +0200

    build: use as-needed linker flag also on OpenBSD
    
    OpenBSD is unusable with binaries with many superfluous libs linked in.
    samba-tool start times of 250 seconds without as-needed vs. 1.4 seconds with
    as-needed.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11355
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Ralph Böhme <rb at sernet.de>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Fri Sep 11 03:37:17 CEST 2015 on sn-devel-104
    
    (cherry picked from commit b0f41c07ffe8600433c20a038b1612c04ed29e89)

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

Summary of changes:
 nsswitch/winbind_nss_solaris.c | 6 ++++++
 wscript                        | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/winbind_nss_solaris.c b/nsswitch/winbind_nss_solaris.c
index 1d0ac90..dfb87e3 100644
--- a/nsswitch/winbind_nss_solaris.c
+++ b/nsswitch/winbind_nss_solaris.c
@@ -259,6 +259,9 @@ _nss_winbind_getgrnam_solwrap(nss_backend_t* be, void* args)
 	if(ret == NSS_STATUS_SUCCESS)
 		NSS_ARGS(args)->returnval = (void*) result;
 
+	if (NSS_ARGS(args)->erange == ERANGE && ret == NSS_STATUS_TRYAGAIN)
+		return NSS_STATUS_UNAVAIL;
+
 	return ret;
 }
 
@@ -278,6 +281,9 @@ _nss_winbind_getgrgid_solwrap(nss_backend_t* be, void* args)
 	if(ret == NSS_STATUS_SUCCESS)
 		NSS_ARGS(args)->returnval = (void*) result;
 
+	if (NSS_ARGS(args)->erange == ERANGE && ret == NSS_STATUS_TRYAGAIN)
+		return NSS_STATUS_UNAVAIL;
+
 	return ret;
 }
 
diff --git a/wscript b/wscript
index a84e5d5..9431e11 100644
--- a/wscript
+++ b/wscript
@@ -166,8 +166,7 @@ def configure(conf):
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
 
-    if not sys.platform.startswith("openbsd"):
-        conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+    conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)


-- 
Samba Shared Repository



More information about the samba-cvs mailing list