ITS#3226: Clear attribute flags after schema_check failed

[openldap] / servers / slapd / back-bdb / dn2id.c

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index be302a6cdd9fd63a76df65e31e1349c8db15974a..6ab0a037808959893e4b670b0336bab25cfce9be 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -77,8 +77,9 @@ bdb_dn2id_add(
        }
 
 #ifndef BDB_MULTIPLE_SUFFIXES
-       if( !be_issuffix( op->o_bd, &ptr )) {
+       if( !be_issuffix( op->o_bd, &ptr ))
 #endif
+       {
                buf[0] = DN_SUBTREE_PREFIX;
                rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
                if( rc != 0 ) {
@@ -95,8 +96,9 @@ bdb_dn2id_add(
                }
                
 #ifdef BDB_MULTIPLE_SUFFIXES
-       if( !be_issuffix( op->o_bd, &ptr )) {
+       if( !be_issuffix( op->o_bd, &ptr ))
 #endif
+       {
                dnParent( &ptr, &pdn );
        
                key.size = pdn.bv_len + 2;
@@ -119,9 +121,9 @@ bdb_dn2id_add(
 #endif
                        goto done;
                }
-#ifndef BDB_MULTIPLE_SUFFIXES
        }
 
+#ifndef BDB_MULTIPLE_SUFFIXES
        while( !be_issuffix( op->o_bd, &ptr ))
 #else
        for (;;)
@@ -153,9 +155,7 @@ bdb_dn2id_add(
                key.data = pdn.bv_val - 1;
                ptr = pdn;
        }
-#ifdef BDB_MULTIPLE_SUFFIXES
        }
-#endif
 
 done:
        op->o_tmpfree( buf, op->o_tmpmemctx );
@@ -215,8 +215,9 @@ bdb_dn2id_delete(
        }
 
 #ifndef BDB_MULTIPLE_SUFFIXES
-       if( !be_issuffix( op->o_bd, &ptr )) {
+       if( !be_issuffix( op->o_bd, &ptr ))
 #endif
+       {
                buf[0] = DN_SUBTREE_PREFIX;
                rc = db->del( db, txn, &key, 0 );
                if( rc != 0 ) {
@@ -233,8 +234,9 @@ bdb_dn2id_delete(
                }
 
 #ifdef BDB_MULTIPLE_SUFFIXES
-       if( !be_issuffix( op->o_bd, &ptr )) {
+       if( !be_issuffix( op->o_bd, &ptr ))
 #endif
+       {
                dnParent( &ptr, &pdn );
 
                key.size = pdn.bv_len + 2;
@@ -257,13 +259,14 @@ bdb_dn2id_delete(
 #endif
                        goto done;
                }
-#ifndef BDB_MULTIPLE_SUFFIXES
        }
 
-       while( !be_issuffix( op->o_bd, &ptr )) {
+#ifndef BDB_MULTIPLE_SUFFIXES
+       while( !be_issuffix( op->o_bd, &ptr ))
 #else
-       for (;;) {
+       for (;;)
 #endif
+       {
                ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
                rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
@@ -289,9 +292,7 @@ bdb_dn2id_delete(
                key.data = pdn.bv_val - 1;
                ptr = pdn;
        }
-#ifdef BDB_MULTIPLE_SUFFIXES
        }
-#endif
 
 done:
        op->o_tmpfree( buf, op->o_tmpmemctx );
@@ -389,7 +390,6 @@ bdb_dn2id_children(
                        return rc;
                }
        }
-
        /* we actually could do a empty get... */
        DBTzero( &data );
        data.data = &id;
@@ -482,8 +482,8 @@ bdb_dn2idl(
        op->o_tmpfree( key.data, op->o_tmpmemctx );
        return rc;
 }
-#else  /* BDB_HIER */
 
+#else  /* BDB_HIER */
 /* Experimental management routines for a hierarchically structured database.
  *
  * Unsupported! Use at your own risk!
@@ -515,8 +515,7 @@ int
 hdb_dup_compare(
        DB *db, 
        const DBT *usrkey,
-       const DBT *curkey
-)
+       const DBT *curkey )
 {
        char *u = (char *)&(((diskNode *)(usrkey->data))->nrdnlen);
        char *c = (char *)&(((diskNode *)(curkey->data))->nrdnlen);
@@ -539,8 +538,7 @@ hdb_dup_compare(
  */
 int hdb_fix_dn(
        Entry *e,
-       int checkit
-)
+       int checkit )
 {
        EntryInfo *ei;
        int rlen = 0, nrlen = 0;
@@ -629,10 +627,21 @@ hdb_dn2id_add(
        key.size = sizeof(ID);
        key.flags = DB_DBT_USERMEM;
 
+       /* Need to make dummy root node once. Subsequent attempts
+        * will fail harmlessly.
+        */
+       if ( eip->bei_id == 0 ) {
+               diskNode dummy = {0};
+               data.data = &dummy;
+               data.size = sizeof(diskNode);
+               data.flags = DB_DBT_USERMEM;
+
+               db->put( db, txn, &key, &data, DB_NODUPDATA );
+       }
+
        if ( bdb->bi_idl_cache_size ) {
                bdb_idl_cache_del( bdb, db, &key );
        }
-
        data.data = d;
        data.size = sizeof(diskNode) + rlen + nrlen;
        data.flags = DB_DBT_USERMEM;
@@ -681,7 +690,6 @@ hdb_dn2id_delete(
        if ( bdb->bi_idl_cache_size ) {
                bdb_idl_cache_del( bdb, db, &key );
        }
-
        rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
        if ( rc ) return rc;
 
@@ -854,7 +862,6 @@ hdb_dn2id_children(
                        return rc;
                }
        }
-
        DBTzero(&data);
        data.data = &d;
        data.ulen = sizeof(d);
@@ -931,7 +938,6 @@ hdb_dn2idl_internal(
                        goto gotit;
                }
        }
-
        BDB_IDL_ZERO( cx->tmp );
 
        if ( !cx->ei ) {
@@ -1003,7 +1009,8 @@ hdb_dn2idl_internal(
                                         * hdb_cache_load will copy them as needed
                                         */
                                        ei.bei_nrdn.bv_val = d->nrdn;
-                                       ei.bei_rdn.bv_len = len - sizeof(diskNode) - ei.bei_nrdn.bv_len;
+                                       ei.bei_rdn.bv_len = len - sizeof(diskNode)
+                                               - ei.bei_nrdn.bv_len;
                                        ei.bei_rdn.bv_val = d->nrdn + ei.bei_nrdn.bv_len + 1;
                                        bdb_idl_insert( cx->tmp, ei.bei_id );
                                        hdb_cache_load( cx->bdb, &ei, &ei2 );
@@ -1017,11 +1024,11 @@ hdb_dn2idl_internal(
                 */
                cx->rc = 0;
                if ( cx->ei->bei_ckids > 0 ) {
-
                        /* Walk the kids tree; order is irrelevant since bdb_idl_insert
                         * will insert in sorted order.
                         */
-                       avl_apply( cx->ei->bei_kids, apply_func, cx->tmp, -1, AVL_POSTORDER );
+                       avl_apply( cx->ei->bei_kids, apply_func,
+                               cx->tmp, -1, AVL_POSTORDER );
                }
                bdb_cache_entryinfo_unlock( cx->ei );
        }
@@ -1030,7 +1037,6 @@ saveit:
        if ( cx->bdb->bi_idl_cache_max_size ) {
                bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );
        }
-
        ;
 gotit:
        if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
@@ -1083,7 +1089,8 @@ hdb_dn2idl(
        LDAP_LOG ( INDEX, ARGS, 
                "=> hdb_dn2ididl( \"%s\" )\n", e->e_nname.bv_val, 0, 0 );
 #else
-       Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2idl( \"%s\" )\n", e->e_nname.bv_val, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2idl( \"%s\" )\n",
+               e->e_nname.bv_val, 0, 0 );
 #endif
 
 #ifndef BDB_MULTIPLE_SUFFIXES
@@ -1096,7 +1103,7 @@ hdb_dn2idl(
 #endif
 
        cx.id = e->e_id;
-       cx.ei = BEI(e);
+       cx.ei = e->e_id ? BEI(e) : &bdb->bi_cache.c_dntree;
        cx.bdb = bdb;
        cx.db = cx.bdb->bi_dn2id->bdi_db;
        cx.prefix = op->ors_scope == LDAP_SCOPE_ONELEVEL