[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-771-g20225d8

[Günther Deschner]

The branch, master has been updated
       via  20225d83dd1d09274bd913d1713c56268a069628 (commit)
      from  64b4d020325534cbdfb82366543ab947feb70c97 (commit)

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


- Log -----------------------------------------------------------------
commit 20225d83dd1d09274bd913d1713c56268a069628
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 3 16:28:59 2009 +0200

    s3-pdb_ldap: Make ldapsam_alias_memberships behave like the tdbsam equivalent.
    
    This lets samr_GetAliasMembership return with NT_STATUS_OK when called with 0
    sids (just what w2k3 does).
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 1b1e22f..fc736c2 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3710,6 +3710,9 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
 	char *filter;
 	enum lsa_SidType type = SID_NAME_USE_NONE;
 
+	*pp_alias_rids = NULL;
+	*p_num_alias_rids = 0;
+
 	if (sid_check_is_builtin(domain_sid)) {
 		type = SID_NAME_ALIAS;
 	}
@@ -3724,6 +3727,10 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
+	if (num_members == 0) {
+		return NT_STATUS_OK;
+	}
+
 	filter = talloc_asprintf(mem_ctx,
 				 "(&(|(objectclass=%s)(sambaGroupType=%d))(|",
 				 LDAP_OBJ_GROUPMAP, type);


-- 
Samba Shared Repository