[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  7006352... s3:ldap: don't search when no values where found
      from  dd0e16b... uuid.c: Remove some dead code

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


- Log -----------------------------------------------------------------
commit 70063522065ab3e5a21fb11db0097b808aa11100
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 31 00:45:09 2009 +0100

    s3:ldap: don't search when no values where found

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 54cb03d..87df75e 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2683,7 +2683,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
 
 	values = ldap_get_values(conn->ldap_struct, entry, "memberUid");
 
-	if (values) {
+	if ((values != NULL) && (values[0] != NULL)) {
 
 		filter = talloc_asprintf(mem_ctx, "(&(objectClass=%s)(|", LDAP_OBJ_SAMBASAMACCOUNT);
 		if (filter == NULL) {


-- 
Samba Shared Repository