[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  bd6a48e... s3: Fix EnumDomainAliases when no aliases are in LDAP
      from  b206d75... s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache (cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb) (cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186)

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


- Log -----------------------------------------------------------------
commit bd6a48e687636d5d9489129faff00e45d50d0d31
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
    (cherry picked from commit f66cc827096c53d4d16b8c850c83a3b5664e9725)
    
    Fix bug #7262 (Unable to maintain users' groups via UsrMgr).
    (cherry picked from commit 1439a1d7ff406dd5dce885100349751151c14bf6)

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

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 249a990..559b87c 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4416,12 +4416,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;
 }
 
@@ -4464,6 +4458,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