ITS#3226: Clear attribute flags after schema_check failed

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

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index 5f2b6e30a5cc9a95eb4491244b50c6793dd7a9b5..3ec1e36c6fcac6af4fd34cf8759676bcab07d80c 100644 (file)
--- a/servers/slapd/back-bdb/nextid.c
+++ b/servers/slapd/back-bdb/nextid.c
@@ -1,8 +1,17 @@
 /* init.c - initialize bdb backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -43,12 +52,9 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
        rc = bdb->bi_id2entry->bdi_db->cursor( bdb->bi_id2entry->bdi_db,
                tid, &cursor, 0 );
 
-       while (rc == 0) {
+       if (rc == 0) {
                rc = cursor->c_get(cursor, &key, &data, DB_LAST);
                cursor->c_close(cursor);
-               if (rc != 0)
-                       break;
-               break;
        }
 
        switch(rc) {
@@ -60,9 +66,14 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
                break;
 
        default:
+#ifdef NEW_LOGGING
+               LDAP_LOG ( INDEX, ERR, "bdb_last_id: get failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_last_id: get failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
+#endif
                goto done;
        }