[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1743-gd4d06a4

[Jeremy Allison]

The branch, master has been updated
       via  d4d06a4ef921e8fa543b86de002829ba0e7f77d3 (commit)
      from  a91bcbccf8a2243dac57cacec6fdfc9907580f69 (commit)

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


- Log -----------------------------------------------------------------
commit d4d06a4ef921e8fa543b86de002829ba0e7f77d3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 21 17:27:25 2009 -0700

    Attempt to fix bug #6386 - Samba Panic triggered by Sophos Control Centre.
    Don't indirect a potentially null pointer.
    Jeremy.

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

Summary of changes:
 source3/groupdb/mapping_ldb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 7ad0bbb..b95ba0a 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -276,7 +276,7 @@ static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
 
 	ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
 			 NULL, "(&(ntName=%s)(objectClass=groupMap))", name);
-	if (ret != LDB_SUCCESS || res->count != 1) {
+	if (ret != LDB_SUCCESS || (res && res->count != 1)) {
 		goto failed;
 	}
 


-- 
Samba Shared Repository