X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fnextid.c;h=c80a7015bfe10e11b907e61d1d6b6c0261c45a14;hb=324431062bff39a1bd3969bd37d4913526dd583f;hp=97772bfcc8dc5a902146e6a545594ee5d5612155;hpb=aec4430d593d316c0a102cb132b8e46d8346eda0;p=openldap

diff --git a/servers/slapd/back-ldbm/nextid.c b/servers/slapd/back-ldbm/nextid.c
index 97772bfcc8..c80a7015bf 100644
--- a/servers/slapd/back-ldbm/nextid.c
+++ b/servers/slapd/back-ldbm/nextid.c
@@ -1,8 +1,17 @@
 /* nextid.c - keep track of the next id to be given out */
 /* $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 1998-2006 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"
@@ -11,10 +20,7 @@
 
 #include <ac/string.h>
 #include <ac/socket.h>
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+#include <ac/param.h>
 
 #include "slap.h"
 #include "back-ldbm.h"
@@ -29,13 +35,8 @@ next_id_read( Backend *be, ID *idp )
 
 	if ( (db = ldbm_cache_open( be, "nextid", LDBM_SUFFIX, LDBM_WRCREAT ))
 	    == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-			   "next_id_read: could not open/create nextid%s\n", LDBM_SUFFIX ));
-#else
 		Debug( LDAP_DEBUG_ANY, "Could not open/create nextid" LDBM_SUFFIX "\n",
 			0, 0, 0 );
-#endif
 
 		return( -1 );
 	}
@@ -68,13 +69,8 @@ next_id_write( Backend *be, ID id )
 
 	if ( (db = ldbm_cache_open( be, "nextid", LDBM_SUFFIX, LDBM_WRCREAT ))
 	    == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-			   "next_id_write: Could not open/create nextid%s\n", LDBM_SUFFIX ));
-#else
 		Debug( LDAP_DEBUG_ANY, "Could not open/create nextid" LDBM_SUFFIX "\n",
 		    0, 0, 0 );
-#endif
 
 		return( -1 );
 	}
@@ -105,11 +101,8 @@ next_id_get( Backend *be, ID *idp )
 
 	*idp = NOID;
 
-	ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex );
-
 	if ( li->li_nextid == NOID ) {
 		if ( ( rc = next_id_read( be, idp ) ) ) {
-			ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
 			return( rc );
 		}
 		li->li_nextid = *idp;
@@ -117,7 +110,6 @@ next_id_get( Backend *be, ID *idp )
 
 	*idp = li->li_nextid;
 
-	ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
 	return( rc );
 }
 
@@ -127,11 +119,8 @@ next_id( Backend *be, ID *idp )
 	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
 	int rc = 0;
 
-	ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex );
-
 	if ( li->li_nextid == NOID ) {
 		if ( ( rc = next_id_read( be, idp ) ) ) {
-			ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
 			return( rc );
 		}
 		li->li_nextid = *idp;
@@ -142,6 +131,5 @@ next_id( Backend *be, ID *idp )
 		rc = -1;
 	}
 
-	ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
 	return( rc );
 }