[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3580-g7f1771f
Karolin Seeger
kseeger at samba.org
Fri May 15 06:53:22 GMT 2009
The branch, v3-2-test has been updated
via 7f1771f26dcc334c32df332545d33937f8602bd6 (commit)
from ef0d72513b5404f176186632aab67d7b87039ba2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 7f1771f26dcc334c32df332545d33937f8602bd6
Author: Björn Jacke <bj at 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
(cherry picked from commit 1b040289f14bb22d3b6ab07a452236549d6c9bf6)
-----------------------------------------------------------------------
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 0d54fe0..9c135c1 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",
--
Samba Shared Repository
More information about the samba-cvs
mailing list