upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor fixes. Passes test008.

Browse source
This commit is contained in:
Howard Chu 2011-08-26 00:13:42 -07:00
parent eae1a9bac5
commit 79805989de
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-mdb/attr.c
View file

@ -109,6 +109,8 @@ mdb_attr_dbs_open(
cr->msg, 0, 0 );
return rc;
}
} else {
rc = 0;
}
flags = MDB_DUPSORT|MDB_DUPFIXED|MDB_INTEGERDUP;

5
servers/slapd/back-mdb/dn2id.c
View file

@ -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;

2
servers/slapd/back-mdb/init.c
View file

@ -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;

2
servers/slapd/back-mdb/libmdb

@ -1 +1 @@
Subproject commit 957ee9186e997e92eb020cafb5fb2b28d45814e7
Subproject commit 4f8f98f19d13644c74958af3a1af824952ef4795