X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fnextid.c;h=9cf349355a9e38c1bf11ba1ace29523c40622bd6;hb=e76299c196bb93fd2e3ca7972260aa55f9c1a796;hp=b9e4151b34aa715c2b2b1a72f9baff38f6591e5a;hpb=6107ba67d2fd7eadb23ffdd1d284306011ef4013;p=openldap

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index b9e4151b34..9cf349355a 100644
--- 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-2002 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-2011 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"
@@ -12,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;
 
@@ -28,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;
@@ -50,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;
 	}