ITS#8578 - remove unused-variables in RE24 testing call (2.4.45)

[openldap] / servers / slapd / back-mdb / init.c

diff --git a/servers/slapd/back-mdb/init.c b/servers/slapd/back-mdb/init.c
index f378a5430f93cedd45e55c216ce20a78fd20b84a..1faae86a51de40b40c565d510e4ef5ab02812ed3 100644 (file)
--- a/servers/slapd/back-mdb/init.c
+++ b/servers/slapd/back-mdb/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2012 The OpenLDAP Foundation.
+ * Copyright 2000-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,7 @@ static const struct berval mdmi_databases[] = {
        BER_BVC("ad2i"),
        BER_BVC("dn2i"),
        BER_BVC("id2e"),
+       BER_BVC("id2v"),
        BER_BVNULL
 };
 
@@ -62,6 +63,9 @@ mdb_db_init( BackendDB *be, ConfigReply *cr )
        mdb->mi_search_stack = NULL;
 
        mdb->mi_mapsize = DEFAULT_MAPSIZE;
+       mdb->mi_rtxn_size = DEFAULT_RTXN_SIZE;
+       mdb->mi_multi_hi = UINT_MAX;
+       mdb->mi_multi_lo = UINT_MAX;
 
        be->be_private = mdb;
        be->be_cf_ocs = be->bd_info->bi_cf_ocs;
@@ -176,18 +180,18 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
 
        if ( rc ) {
                Debug( LDAP_DEBUG_ANY,
-                       LDAP_XSTRING(mdb_db_open) ": database \"%s\" cannot be opened, err %d. "
+                       LDAP_XSTRING(mdb_db_open) ": database \"%s\" cannot be opened: %s (%d). "
                        "Restore from backup!\n",
-                       be->be_suffix[0].bv_val, rc, 0 );
+                       be->be_suffix[0].bv_val, mdb_strerror(rc), rc );
                goto fail;
        }
 
        rc = mdb_txn_begin( mdb->mi_dbenv, NULL, flags & MDB_RDONLY, &txn );
        if ( rc ) {
                Debug( LDAP_DEBUG_ANY,
-                       LDAP_XSTRING(mdb_db_open) ": database \"%s\" cannot be opened, err %d. "
+                       LDAP_XSTRING(mdb_db_open) ": database \"%s\" cannot be opened: %s (%d). "
                        "Restore from backup!\n",
-                       be->be_suffix[0].bv_val, rc, 0 );
+                       be->be_suffix[0].bv_val, mdb_strerror(rc), rc );
                goto fail;
        }
 
@@ -200,6 +204,8 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
                } else {
                        if ( i == MDB_DN2ID )
                                flags |= MDB_DUPSORT;
+                       if ( i == MDB_ID2VAL )
+                               flags ^= MDB_INTEGERKEY|MDB_DUPSORT;
                        if ( !(slapMode & SLAP_TOOL_READONLY) )
                                flags |= MDB_CREATE;
                }
@@ -223,9 +229,42 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
 
                if ( i == MDB_ID2ENTRY )
                        mdb_set_compare( txn, mdb->mi_dbis[i], mdb_id_compare );
-               else if ( i == MDB_DN2ID )
+               else if ( i == MDB_ID2VAL ) {
+                       mdb_set_compare( txn, mdb->mi_dbis[i], mdb_id2v_compare );
+                       mdb_set_dupsort( txn, mdb->mi_dbis[i], mdb_id2v_dupsort );
+               } else if ( i == MDB_DN2ID ) {
+                       MDB_cursor *mc;
+                       MDB_val key, data;
                        mdb_set_dupsort( txn, mdb->mi_dbis[i], mdb_dup_compare );
-
+                       /* check for old dn2id format */
+                       rc = mdb_cursor_open( txn, mdb->mi_dbis[i], &mc );
+                       /* first record is always ID 0 */
+                       rc = mdb_cursor_get( mc, &key, &data, MDB_FIRST );
+                       if ( rc == 0 ) {
+                               rc = mdb_cursor_get( mc, &key, &data, MDB_NEXT );
+                               if ( rc == 0 ) {
+                                       int len;
+                                       unsigned char *ptr;
+                                       ptr = data.mv_data;
+                                       len = (ptr[0] & 0x7f) << 8 | ptr[1];
+                                       if (data.mv_size < 2*len + 4 + 2*sizeof(ID)) {
+                                               snprintf( cr->msg, sizeof(cr->msg),
+                                               "database \"%s\": DN index needs upgrade, "
+                                               "run \"slapindex entryDN\".",
+                                               be->be_suffix[0].bv_val );
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       LDAP_XSTRING(mdb_db_open) ": %s\n",
+                                                       cr->msg, 0, 0 );
+                                               if ( !(slapMode & SLAP_TOOL_READMAIN ))
+                                                       rc = LDAP_OTHER;
+                                               mdb->mi_flags |= MDB_NEED_UPGRADE;
+                                       }
+                               }
+                       }
+                       mdb_cursor_close( mc );
+                       if ( rc == LDAP_OTHER )
+                               goto fail;
+               }
        }
 
        rc = mdb_ad_read( mdb, txn );
@@ -234,14 +273,23 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
                goto fail;
        }
 
-       rc = mdb_attr_dbs_open( be, txn, cr );
-       if ( rc ) {
-               mdb_txn_abort( txn );
-               goto fail;
+       /* slapcat doesn't need indexes. avoid a failure if
+        * a configured index wasn't created yet.
+        */
+       if ( !(slapMode & SLAP_TOOL_READONLY) ) {
+               rc = mdb_attr_dbs_open( be, txn, cr );
+               if ( rc ) {
+                       mdb_txn_abort( txn );
+                       goto fail;
+               }
        }
 
        rc = mdb_txn_commit(txn);
        if ( rc != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       LDAP_XSTRING(mdb_db_open) ": database %s: "
+                       "txn_commit failed: %s (%d)\n",
+                       be->be_suffix[0].bv_val, mdb_strerror(rc), rc );
                goto fail;
        }
 
@@ -416,6 +464,7 @@ mdb_back_initialize(
        bi->bi_op_search = mdb_search;
 
        bi->bi_op_unbind = 0;
+       bi->bi_op_txn = mdb_txn;
 
        bi->bi_extended = mdb_extended;
 
@@ -440,6 +489,7 @@ mdb_back_initialize(
        bi->bi_tool_sync = 0;
        bi->bi_tool_dn2id_get = mdb_tool_dn2id_get;
        bi->bi_tool_entry_modify = mdb_tool_entry_modify;
+       bi->bi_tool_entry_delete = mdb_tool_entry_delete;
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;