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

[Karolin Seeger]

The branch, v3-5-stable has been updated
       via  919b1bd... WHATSNEW: Update changes.
       via  68c1d26... s3: Happy New Year 2010
       via  ad67530... Prevent NULL dereference if group has no members (cherry picked from commit 8c3dd08f6a361a24799f5ec958668e477b8127d0)
      from  ea7c356... WHATSNEW: Update changes.

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


- Log -----------------------------------------------------------------
commit 919b1bdacb97cc7e90b251428c63587dcab4cee9
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 4 14:42:46 2010 +0100

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit 26a85914e38acb4f83ee535618aeb05453dd1bf6)

commit 68c1d26d7998f1779880ccc560cb82e8e54bceb5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jan 4 08:42:03 2010 +0100

    s3: Happy New Year 2010
    
    metze
    (cherry picked from commit 2ed51fbc4c3ff576db31c0258a91dc6347aae670)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 1ea5e114f3bb5fb22a7dab36b69a08e5a09df50d)

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

    Prevent NULL dereference if group has no members
    (cherry picked from commit 8c3dd08f6a361a24799f5ec958668e477b8127d0)

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

Summary of changes:
 WHATSNEW.txt                    |    4 ++++
 source3/include/smb.h           |    2 +-
 source3/winbindd/winbindd_rpc.c |    8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a7906c8..eb0c8f3 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -142,6 +142,10 @@ o   Simo Sorce <idra at samba.org>
     * Change the way mksysms work in libtalloc.
 
 
+o   Jim McDonough <jmcd at samba.org>
+    * BUG 7014: Fix Winbind crash when retrieving empty group members.
+
+
 o   Stefan Metzmacher <metze at samba.org>
     * Add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr()
       to tsocket.
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 4affd4a..b23ea64 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
 #define _SMB_H
 
 /* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2009"
+#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2010"
 
 
 #if defined(LARGE_SMB_OFF_T)
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index e7a1f86..8797aeb 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -782,16 +782,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