From: Björn Jacke Date: Thu, 7 May 2009 15:50:34 +0000 (+0200) Subject: s3/ldap: also handle DirX return codes X-Git-Tag: samba-3.2.12~37 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=554cdcbd15155e21a7226a8393ce16929093cd2b;p=thirdparty%2Fsamba.git s3/ldap: also handle DirX return codes this is a backport of f238809d236443b8968e1b4b197a55935c7c7e85 from master (cherry picked from commit 1b040289f14bb22d3b6ab07a452236549d6c9bf6) (cherry picked from commit 7f1771f26dcc334c32df332545d33937f8602bd6) --- diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index 0d54fe02cc7..9c135c16c66 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/passdb/pdb_ldap.c @@ -3280,6 +3280,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", @@ -3294,6 +3295,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",