svn commit: samba r20373 - in branches/SAMBA_4_0/source/lib/ldb/common: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-12-28 03:31:18 +0000 (Thu, 28 Dec 2006)
New Revision: 20373

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

Log:
When adding a base to a "" DN, don't precede it with a comma (,)

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-12-28 00:24:34 UTC (rev 20372)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-12-28 03:31:18 UTC (rev 20373)
@@ -988,7 +988,11 @@
 		}
 
 		if (dn->casefold && s) {
-			t = talloc_asprintf(dn, "%s,%s", dn->casefold, s);
+			if (*dn->casefold) {
+				t = talloc_asprintf(dn, "%s,%s", dn->casefold, s);
+			} else {
+				t = talloc_strdup(dn, s);
+			}
 			LDB_FREE(dn->casefold);
 			dn->casefold = t;
 		}
@@ -1001,7 +1005,11 @@
 			return false;
 		}
 		
-		t = talloc_asprintf(dn, "%s,%s", dn->linearized, s);
+		if (*dn->linearized) {
+			t = talloc_asprintf(dn, "%s,%s", dn->linearized, s);
+		} else {
+			t = talloc_strdup(dn, s);
+		}
 		if ( ! t) {
 			dn->invalid = true;
 			return false;