[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-864-gdd557cc

[Andrew Bartlett]

The branch, master has been updated
       via  dd557cc3613fa791d44cf34d2a1ddaaff93ab3fd (commit)
       via  37b8235afe4036f7defd9465ae431cae9804fa18 (commit)
       via  11ff224e13a26e4ff9fbd01dec395262aac0f9f9 (commit)
      from  457191e9f396898b8a511cf860f24986f36fd879 (commit)

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


- Log -----------------------------------------------------------------
commit dd557cc3613fa791d44cf34d2a1ddaaff93ab3fd
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Aug 7 14:22:54 2009 +1000

    s4:ldb Make error message in rnd_name more useful

commit 37b8235afe4036f7defd9465ae431cae9804fa18
Merge: 11ff224e13a26e4ff9fbd01dec395262aac0f9f9 457191e9f396898b8a511cf860f24986f36fd879
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Aug 7 13:08:35 2009 +1000

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel

commit 11ff224e13a26e4ff9fbd01dec395262aac0f9f9
Author: Oliver Liebel <oliver at itc.li>
Date:   Fri Aug 7 12:38:51 2009 +1000

    s4:setup Remove extra newlines that break OpenLDAP backend

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

Summary of changes:
 source4/lib/ldb/modules/rdn_name.c   |   12 +++++++++---
 source4/setup/secrets_sasl_ldap.ldif |    2 --
 2 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index 65cdb25..8b54f52 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -156,9 +156,15 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
 			}
 		}
 		if (i == attribute->num_values) {
-			ldb_debug_set(ldb, LDB_DEBUG_FATAL, 
-				      "RDN mismatch on %s: %s (%s)", 
-				      ldb_dn_get_linearized(msg->dn), rdn_name, rdn_val.data);
+			char *rdn_errstring = talloc_asprintf(ac, "RDN mismatch on %s: %s (%.*s) should match one of:", 
+							  ldb_dn_get_linearized(msg->dn), rdn_name, 
+							  (int)rdn_val.length, (const char *)rdn_val.data);
+			for (i = 0; i < attribute->num_values; i++) {
+				rdn_errstring = talloc_asprintf_append(rdn_errstring, " (%.*s)",
+								       (int)attribute->values[i].length, 
+								       (const char *)attribute->values[i].data);
+			}
+			ldb_debug_set(ldb, LDB_DEBUG_FATAL, "%s", rdn_errstring);
 			talloc_free(ac);
 			/* Match AD's error here */
 			return LDB_ERR_INVALID_DN_SYNTAX;
diff --git a/source4/setup/secrets_sasl_ldap.ldif b/source4/setup/secrets_sasl_ldap.ldif
index 81ccfee..cccbedb 100644
--- a/source4/setup/secrets_sasl_ldap.ldif
+++ b/source4/setup/secrets_sasl_ldap.ldif
@@ -5,5 +5,3 @@ cn: SAMDB Credentials
 secret:: ${LDAPADMINPASS_B64}
 samAccountName: ${LDAPADMINUSER}
 realm: ${LDAPADMINREALM}
-
-


-- 
Samba Shared Repository