summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-02 19:09:13 +0200
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-02 19:17:23 +0200
commitd2ac4cbceeab35b95dd892390b46adbf6bc65815 (patch)
tree565422fdb1d80f26cc5fdbc8042273333d4b0ff3
parent2f211daa47d16eddb807f8cde00509f62be7fd1f (diff)
downloadsamba-d2ac4cbceeab35b95dd892390b46adbf6bc65815.tar.gz
samba-d2ac4cbceeab35b95dd892390b46adbf6bc65815.tar.bz2
samba-d2ac4cbceeab35b95dd892390b46adbf6bc65815.zip
s4:rdn_name module - a normal error message should be enough for this failure
I don't think that we really want to have this error printed out on the server console (stdout) since this hasn't serious results as DB or data corruption and similar.
-rw-r--r--source4/lib/ldb/modules/rdn_name.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index 8b54f52b5e..07abb53ca4 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -156,15 +156,17 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
}
}
if (i == attribute->num_values) {
- 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);
+ 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);
+ 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);
+ ldb_set_errstring(ldb, rdn_errstring);
talloc_free(ac);
/* Match AD's error here */
return LDB_ERR_INVALID_DN_SYNTAX;