ITS#3773 fix RDN comparison

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index a2719a5dbc92c22ab1c84f04b41af3e676b6536f..69f80dd2f63da8b6e7573ae62278117cff58b5e9 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -629,6 +629,7 @@ hdb_dn2id(
        int             rc = 0, nrlen;
        diskNode *d;
        char    *ptr;
+       unsigned char dlen[2];
        ID idp;
 
        nrlen = dn_rdnlen( op->o_bd, in );
@@ -653,12 +654,15 @@ hdb_dn2id(
        d = op->o_tmpalloc( data.size * 3, op->o_tmpmemctx );
        d->nrdnlen[1] = nrlen & 0xff;
        d->nrdnlen[0] = (nrlen >> 8) | 0x80;
+       dlen[0] = d->nrdnlen[0];
+       dlen[1] = d->nrdnlen[1];
        ptr = lutil_strncopy( d->nrdn, in->bv_val, nrlen );
        *ptr = '\0';
        data.data = d;
 
        rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE );
-       if ( rc == 0 && strncmp( d->nrdn, in->bv_val, nrlen )) {
+       if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] ||
+               strncmp( d->nrdn, in->bv_val, nrlen ))) {
                rc = DB_NOTFOUND;
        }
        if ( rc == 0 ) {