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

abartlet at samba.org abartlet at samba.org
Fri Oct 14 02:05:52 GMT 2005


Author: abartlet
Date: 2005-10-14 02:05:51 +0000 (Fri, 14 Oct 2005)
New Revision: 10980

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

Log:
Use ldb_attr_cmp and ldb_dn_escape_value

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	2005-10-14 01:09:37 UTC (rev 10979)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2005-10-14 02:05:51 UTC (rev 10980)
@@ -853,15 +853,15 @@
 
 	/* Walk backwards down the DN, grabbing 'dc' components at first */
 	for (i = dn->comp_num - 1 ; i >= 0; i--) {
-		if (strcasecmp(dn->components[i].name, "dc") != 0) {
+		if (ldb_attr_cmp(dn->components[i].name, "dc") != 0) {
 			break;
 		}
 		if (cracked) {
 			cracked = talloc_asprintf(mem_ctx, "%s.%s",
-						  (const char *)dn->components[i].value.data,
+						  ldb_dn_escape_value(mem_ctx, dn->components[i].value),
 						  cracked);
 		} else {
-			cracked = talloc_strdup(mem_ctx, (const char *)dn->components[i].value.data);
+			cracked = ldb_dn_escape_value(mem_ctx, dn->components[i].value);
 		}
 		if (!cracked) {
 			return NULL;
@@ -881,7 +881,7 @@
 	/* Now walk backwards appending remaining components */
 	for (; i > 0; i--) {
 		cracked = talloc_asprintf(mem_ctx, "%s/%s", cracked, 
-					  dn->components[i].value.data);
+					  ldb_dn_escape_value(mem_ctx, dn->components[i].value));
 		if (!cracked) {
 			return NULL;
 		}
@@ -890,10 +890,10 @@
 	/* Last one, possibly a newline for the 'ex' format */
 	if (ex_format) {
 		cracked = talloc_asprintf(mem_ctx, "%s\n%s", cracked, 
-					  dn->components[i].value.data);
+					  ldb_dn_escape_value(mem_ctx, dn->components[i].value));
 	} else {
 		cracked = talloc_asprintf(mem_ctx, "%s/%s", cracked, 
-					  dn->components[i].value.data);
+					  ldb_dn_escape_value(mem_ctx, dn->components[i].value));
 	}
 	return cracked;
 }



More information about the samba-cvs mailing list