[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-936-g5616abe

[Björn Jacke]

The branch, v3-4-test has been updated
       via  5616abe2e8fb6a95fa82b80e8e97090e956b98ff (commit)
      from  69551b562a575c300d14bd1691fe5213db71d6bc (commit)

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


- Log -----------------------------------------------------------------
commit 5616abe2e8fb6a95fa82b80e8e97090e956b98ff
Author: Björn Jacke <bj at sernet.de>
Date:   Thu May 7 17:50:34 2009 +0200

    s3/ldap: also handle DirX return codes

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 6217028..afdb64c 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3269,6 +3269,7 @@ static NTSTATUS ldapsam_delete_group_mapping_entry(struct pdb_methods *methods,
 						groupmap_attr_list_to_delete));
  
 	if ((rc == LDAP_NAMING_VIOLATION) ||
+	    (rc == LDAP_NOT_ALLOWED_ON_RDN) ||
 	    (rc == LDAP_OBJECT_CLASS_VIOLATION)) {
 		const char *attrs[] = { "sambaGroupType", "description",
 					"displayName", "sambaSIDList",
@@ -3283,6 +3284,7 @@ static NTSTATUS ldapsam_delete_group_mapping_entry(struct pdb_methods *methods,
 	}
 
 	if ((rc == LDAP_NAMING_VIOLATION) ||
+	    (rc == LDAP_NOT_ALLOWED_ON_RDN) ||
 	    (rc == LDAP_OBJECT_CLASS_VIOLATION)) {
 		const char *attrs[] = { "sambaGroupType", "description",
 					"displayName", "sambaSIDList",


-- 
Samba Shared Repository