[SCM] Samba Shared Repository - branch v3-4-stable updated

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  656624f... WHATSNEW: Update changes.
       via  2ca6165... Prevent NULL dereference if group has no members
      from  ce98fae... WHATSNEW: Update changes.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable


- Log -----------------------------------------------------------------
commit 656624f2d643567451f8c7f1f9bb91a6262148fa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 4 13:59:21 2010 +0100

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit 945b2d1982d4e47aed2552a29e522b3c03b931f4)

commit 2ca6165c786b30f6bd6667a5517e43ea39f79875
Author: Jim McDonough <jmcd at samba.org>
Date:   Wed Dec 30 15:04:55 2009 -0500

    Prevent NULL dereference if group has no members
    
    Fix bug #7014 (domain mode winbind crashes retriveing empty group members).
    (cherry picked from commit 7ea471ba8db84b4fb2f02672e59a9f2a9932b4fa)

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

Summary of changes:
 WHATSNEW.txt                    |    2 ++
 source3/winbindd/winbindd_rpc.c |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 129cd3f..18d0d31 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -10,6 +10,7 @@ Major enhancements in Samba 3.4.4 include:
 
    o Fix interdomain trust relationships with Win2008R2 (bug #6697).
    o Fix Winbind crashes when queried from nss (bug #6889).
+   o Fix Winbind crash when retrieving empty group members (bug #7014).
    o Fix "UID range full" error in Winbind (bug #6901).
    o Fix multiple LDAP servers in "idmap backend" and "idmap alloc
      backend" (bug #6910).
@@ -66,6 +67,7 @@ o   Volker Lendecke <vl at samba.org>
 
 o   Jim McDonough <jmcd at samba.org>
     * BUG 6967: Fix 'net ads join' with OU.
+    * BUG 7014: Fix Winbind crash when retrieving empty group members.
 
 
 o   Andrew Tridgell <tridge at samba.org>
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index f176fb3..aa8a5c8 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -789,16 +789,16 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
         if (!NT_STATUS_IS_OK(result))
 		return result;
 
-	*num_names = rids->count;
-	rid_mem = rids->rids;
-
-	if (!*num_names) {
+	if (!rids || !rids->count) {
 		names = NULL;
 		name_types = NULL;
 		sid_mem = NULL;
 		return NT_STATUS_OK;
 	}
 
+	*num_names = rids->count;
+	rid_mem = rids->rids;
+
         /* Step #2: Convert list of rids into list of usernames.  Do this
            in bunches of ~1000 to avoid crashing NT4.  It looks like there
            is a buffer overflow or something like that lurking around


-- 
Samba Shared Repository