]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3/ldap: also handle DirX return codes
authorBjörn Jacke <bj@sernet.de>
Thu, 7 May 2009 15:50:34 +0000 (17:50 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 15 May 2009 06:52:08 +0000 (08:52 +0200)
this is a backport of f238809d236443b8968e1b4b197a55935c7c7e85 from master

source/passdb/pdb_ldap.c

index 70a1c62bef8f447031a09e1469c32c832f6ad5c4..554eb6e9e34c183a01b3f45597ae35de06e416e5 100644 (file)
@@ -3282,6 +3282,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",
@@ -3296,6 +3297,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",