svn commit: samba r19965 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .

[metze at samba.org]

Author: metze
Date: 2006-11-30 10:16:19 +0000 (Thu, 30 Nov 2006)
New Revision: 19965

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19965

Log:
make the output a bit nicer

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c	2006-11-30 10:03:54 UTC (rev 19964)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c	2006-11-30 10:16:19 UTC (rev 19965)
@@ -120,11 +120,12 @@
 	h = ldb_attrib_handler(ldb, attr);
 	r = h->canonicalise_fn(ldb, ldb, value, &v);
 	if (r != LDB_SUCCESS) {
+		const char *errstr = ldb_errstring(ldb);
 		/* canonicalisation can be refused. For example, 
 		   a attribute that takes wildcards will refuse to canonicalise
 		   if the value contains a wildcard */
-		ldb_asprintf_errstring(ldb, "Failed to create index key for attribute '%s':%s:%s",
-				       attr, ldb_strerror(r), ldb_errstring(ldb));
+		ldb_asprintf_errstring(ldb, "Failed to create index key for attribute '%s':%s%s%s",
+				       attr, ldb_strerror(r), (errstr?":":""), (errstr?errstr:""));
 		talloc_free(attr_folded);
 		return NULL;
 	}