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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  2311601... s3: change ldap filter to what really was intended (cherry picked from commit 9b75650f1a963e36a6dd697b5ad2725a8c7c9250)
      from  085bd69... WHATSNEW: Update changes since 3.5.0rc2.

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


- Log -----------------------------------------------------------------
commit 23116018779938f931394a022893f2a46654a697
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Feb 10 13:48:11 2010 +0100

    s3: change ldap filter to what really was intended (cherry picked from commit 9b75650f1a963e36a6dd697b5ad2725a8c7c9250)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Part of a fix for bug #7116.

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

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 ad60228..ab041fe 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3833,7 +3833,7 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
 	}
 
 	filter = talloc_asprintf(mem_ctx,
-				 "(&(|(objectclass=%s)(sambaGroupType=%d))(|",
+				 "(&(objectclass=%s)(sambaGroupType=%d)(|",
 				 LDAP_OBJ_GROUPMAP, type);
 
 	for (i=0; i<num_members; i++)


-- 
Samba Shared Repository