[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f66cc82... s3: Fix EnumDomainAliases when no aliases are in LDAP
      from  ba809ec... s3:pdb_ldap: fix bug 7505 - init_sam_from_ldap stores group in sid2uid cache

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


- Log -----------------------------------------------------------------
commit f66cc827096c53d4d16b8c850c83a3b5664e9725
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 10 15:40:14 2010 +0200

    s3: Fix EnumDomainAliases when no aliases are in LDAP
    
    We used to return NT_STATUS_ACCESS_DENIED, now we just return 0 entries, just
    like W2k8 does.
    
    usrmgr.exe was pretty unhappy with the NT_STATUS_ACCESS_DENIED

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index b81d1e6..d2b4f4f 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4441,12 +4441,6 @@ static bool ldapsam_search_firstpage(struct pdb_search *search)
         }
         state->current_entry = ldap_first_entry(ld, state->entries);
 
-	if (state->current_entry == NULL) {
-		ldap_msgfree(state->entries);
-		state->entries = NULL;
-		return false;
-	}
-
 	return True;
 }
 
@@ -4489,6 +4483,10 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
 	bool result;
 
  retry:
+	if (state->current_entry == NULL) {
+		return false;
+	}
+
 	if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
 		return False;
 


-- 
Samba Shared Repository