From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 25 Oct 2009 02:13:41 +0000 (+1100)
Subject: s4-ldb: ensure DNs pass validity tests in indexing
X-Git-Tag: tdb-1.2.0~471
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=b55a5adab99f535bb392662d54afbabed116a3b6

s4-ldb: ensure DNs pass validity tests in indexing
---

diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index 5002de527bf..252154ffd92 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -401,6 +401,10 @@ static struct ldb_dn *ltdb_index_key(struct ldb_context *ldb,
 	if (ldb_should_b64_encode(ldb, &v)) {
 		char *vstr = ldb_base64_encode(ldb, (char *)v.data, v.length);
 		if (!vstr) return NULL;
+		/* remove trailing '=' to make it a valid DN */
+		if (vstr[strlen(vstr)-1] == '=') {
+			vstr[strlen(vstr)-1] = 0;
+		}
 		ret = ldb_dn_new_fmt(ldb, ldb, "%s:%s::%s", LTDB_INDEX, attr_folded, vstr);
 		talloc_free(vstr);
 	} else {