[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1486-gf238809

[Björn Jacke]

The branch, master has been updated
       via  f238809d236443b8968e1b4b197a55935c7c7e85 (commit)
       via  ddd37c2b235eb03ddb438ebb2cdd14dd67f867f3 (commit)
      from  646668bc51d42273a3665bd80bd044287e73bf2a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


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

    s3/ldap: also handle DirX return codes

commit ddd37c2b235eb03ddb438ebb2cdd14dd67f867f3
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Apr 4 11:21:01 2009 +0200

    s3:configure: "test" only takes one "="

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

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


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 0e972e7..b532372 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5989,7 +5989,7 @@ AC_ARG_ENABLE(dnssd,
 [AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=no)])])
 
 AC_SUBST(DNSSD_LIBS)
-if test x"$enable_dnssd" == x"yes"; then
+if test x"$enable_dnssd" = x"yes"; then
     have_dnssd_support=yes
 
     AC_CHECK_HEADERS(dns_sd.h)
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 01d3da8..01b2eec 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3270,6 +3270,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",
@@ -3284,6 +3285,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