summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-05-21 17:27:25 -0700
committerKarolin Seeger <kseeger@samba.org>2009-05-26 09:39:46 +0200
commitba3c7987d3afcf2b1fb4400d5215a46ecbc616ee (patch)
tree220e27c08d35b4c8046774e4c85e8bf464d473d6 /source3
parent5f7bf6ba3a6fcb2792ca69b1b6a10bb065e9de14 (diff)
downloadsamba-ba3c7987d3afcf2b1fb4400d5215a46ecbc616ee.tar.gz
Attempt to fix bug #6386 - Samba Panic triggered by Sophos Control Centre.
Don't indirect a potentially null pointer. Jeremy. (cherry picked from commit b4f6bb84d1bcd5a09d7c20c2a7dac0bfb11f199f)
Diffstat (limited to 'source3')
-rw-r--r--source3/groupdb/mapping_ldb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index a162c194d6e..fffc684cdcf 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;
}