From: Howard Chu <hyc@openldap.org>
Date: Fri, 26 Aug 2011 07:13:42 +0000 (-0700)
Subject: Minor fixes. Passes test008.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79805989de706dc63d4e7556185b24b954045daa;p=thirdparty%2Fopenldap.git

Minor fixes. Passes test008.
---

diff --git a/servers/slapd/back-mdb/attr.c b/servers/slapd/back-mdb/attr.c
index 47dae95e28..8207d50a2f 100644
--- a/servers/slapd/back-mdb/attr.c
+++ b/servers/slapd/back-mdb/attr.c
@@ -109,6 +109,8 @@ mdb_attr_dbs_open(
 				cr->msg, 0, 0 );
 			return rc;
 		}
+	} else {
+		rc = 0;
 	}
 
 	flags = MDB_DUPSORT|MDB_DUPFIXED|MDB_INTEGERDUP;
diff --git a/servers/slapd/back-mdb/dn2id.c b/servers/slapd/back-mdb/dn2id.c
index d080ec2e08..37100b8dbe 100644
--- a/servers/slapd/back-mdb/dn2id.c
+++ b/servers/slapd/back-mdb/dn2id.c
@@ -575,7 +575,7 @@ mdb_id2name(
 	dptr = dn;
 	nptr = ndn;
 	while (id) {
-		int nrlen, rlen;
+		unsigned int nrlen, rlen;
 		key.mv_data = &id;
 		data.mv_size = 0;
 		data.mv_data = "";
@@ -586,13 +586,14 @@ mdb_id2name(
 		memcpy( &id, ptr, sizeof(ID) );
 		d = data.mv_data;
 		nrlen = (d->nrdnlen[0] << 8) | d->nrdnlen[1];
+		rlen = data.mv_size - sizeof(diskNode) - nrlen;
+		assert( nrlen < 1024 && rlen < 1024 );	/* FIXME: Sanity check */
 		if (nptr > ndn) {
 			*nptr++ = ',';
 			*dptr++ = ',';
 		}
 		/* copy name and trailing NUL */
 		memcpy( nptr, d->nrdn, nrlen+1 );
-		rlen = data.mv_size - sizeof(diskNode) - nrlen;
 		memcpy( dptr, d->nrdn+nrlen+1, rlen+1 );
 		nptr += nrlen;
 		dptr += rlen;
diff --git a/servers/slapd/back-mdb/init.c b/servers/slapd/back-mdb/init.c
index 5c8b75148c..f2e69a6ff6 100644
--- a/servers/slapd/back-mdb/init.c
+++ b/servers/slapd/back-mdb/init.c
@@ -394,7 +394,9 @@ mdb_back_initialize(
 
 	bi->bi_extended = mdb_extended;
 
+#if 0	/* FIXME: Redundant, why does this exist? */
 	bi->bi_chk_referrals = mdb_referrals;
+#endif
 	bi->bi_operational = mdb_operational;
 
 	bi->bi_has_subordinates = mdb_hasSubordinates;
diff --git a/servers/slapd/back-mdb/libmdb b/servers/slapd/back-mdb/libmdb
index 957ee9186e..4f8f98f19d 160000
--- a/servers/slapd/back-mdb/libmdb
+++ b/servers/slapd/back-mdb/libmdb
@@ -1 +1 @@
-Subproject commit 957ee9186e997e92eb020cafb5fb2b28d45814e7
+Subproject commit 4f8f98f19d13644c74958af3a1af824952ef4795