[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  7f59711 nsswitch: Skip groups we were not able to map.
      from  fe670be s3:torture: use cli_state_client_guid in run_smb2_multi_channel()

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


- Log -----------------------------------------------------------------
commit 7f59711f076e98ece099f6b38ff6da8c80fa6d5e
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Sep 19 13:33:10 2014 +0200

    nsswitch: Skip groups we were not able to map.
    
    If we have configured the idmap_ad backend it is possible that the user
    is in a group without a gid set. This will result in (uid_t)-1 as the
    gid. We return this invalid gid to NSS which is wrong.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10824
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Fri Sep 19 17:57:14 CEST 2014 on sn-devel-104

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

Summary of changes:
 nsswitch/winbind_nss_linux.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/winbind_nss_linux.c b/nsswitch/winbind_nss_linux.c
index 8d66a74..70ede3e 100644
--- a/nsswitch/winbind_nss_linux.c
+++ b/nsswitch/winbind_nss_linux.c
@@ -1101,6 +1101,11 @@ _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start,
 				continue;
 			}
 
+			/* Skip groups without a mapping */
+			if (gid_list[i] == (uid_t)-1) {
+				continue;
+			}
+
 			/* Filled buffer ? If so, resize. */
 
 			if (*start == *size) {


-- 
Samba Shared Repository