[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5262-g1b04028

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  1b040289f14bb22d3b6ab07a452236549d6c9bf6 (commit)
      from  a72e409bd1b9a9d91bd7311417d7175a64aa39b0 (commit)

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


- Log -----------------------------------------------------------------
commit 1b040289f14bb22d3b6ab07a452236549d6c9bf6
Author: Björn Jacke <b...@sernet.de>
Date:   Thu May 7 17:50:34 2009 +0200

    s3/ldap: also handle DirX return codes
    
    this is a backport of f238809d236443b8968e1b4b197a55935c7c7e85 from master

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

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


Changeset truncated at 500 lines:

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 70a1c62..554eb6e 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -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",


-- 
Samba Shared Repository