Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index 43fcbdf6cfff2933e5a122efc34a4e45a6f16690..ea6fec8c65cd36d318e8ae0b75fdcfd0701c1907 100644 (file)
--- a/servers/slapd/back-bdb/nextid.c
+++ b/servers/slapd/back-bdb/nextid.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,7 +21,7 @@
 
 #include "back-bdb.h"
 
-int bdb_next_id( BackendDB *be, DB_TXN *tid, ID *out )
+int bdb_next_id( BackendDB *be, ID *out )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 
@@ -37,13 +37,14 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        int rc;
        ID id = 0;
+       unsigned char idbuf[sizeof(ID)];
        DBT key, data;
        DBC *cursor;
 
        DBTzero( &key );
        key.flags = DB_DBT_USERMEM;
-       key.data = (char *) &id;
-       key.ulen = sizeof( id );
+       key.data = (char *) idbuf;
+       key.ulen = sizeof( idbuf );
 
        DBTzero( &data );
        data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
@@ -59,21 +60,16 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
 
        switch(rc) {
        case DB_NOTFOUND:
-               id = 0;
                rc = 0;
-               /* FALLTHROUGH */
+               break;
        case 0:
+               BDB_DISK2ID( idbuf, &id );
                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;
        }