ITS#7657 back-mdb improve alias deref

Don't search for scopes of entries with no children

diff --git a/servers/slapd/back-mdb/dn2id.c b/servers/slapd/back-mdb/dn2id.c
index 69f88c330d263d2e6fe1ff39e5f5c0c35f78895c..93fd3e387e968a1928eaa0f82211bcbc3687e777 100644 (file)
--- a/servers/slapd/back-mdb/dn2id.c
+++ b/servers/slapd/back-mdb/dn2id.c
@@ -641,6 +641,22 @@ mdb_idscope(
        rc = mdb_cursor_open( txn, dbi, &cursor );
        if ( rc ) return rc;
 
+       /* first see if base has any children at all */
+       key.mv_data = &base;
+       rc = mdb_cursor_get( cursor, &key, &data, MDB_SET );
+       if ( rc ) {
+               goto leave;
+       }
+       {
+               size_t dkids;
+               rc = mdb_cursor_count( cursor, &dkids );
+               if ( rc == 0 ) {
+                       if ( dkids < 2 ) {
+                               goto leave;
+                       }
+               }
+       }
+
        ida = mdb_idl_first( ids, &cid );
 
        /* Don't bother moving out of ids if it's a range */