X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fbind.c;h=7a9230dcdc355291fae7a7323585a3396a5a6e49;hb=fb7ac08adae76c588fde2a5eccf70b879c555beb;hp=d05777336e1ddfb43288f1c838b971e48cbeccc4;hpb=2027e7322a9246aacfe875381eff78fb346719d5;p=openldap

diff --git a/servers/slapd/back-bdb/bind.c b/servers/slapd/back-bdb/bind.c
index d05777336e..7a9230dcdc 100644
--- a/servers/slapd/back-bdb/bind.c
+++ b/servers/slapd/back-bdb/bind.c
@@ -40,22 +40,45 @@ bdb_bind(
 
 	AttributeDescription *password = slap_schema.si_ad_userPassword;
 
+	u_int32_t	locker;
+	DB_LOCK		lock;
+
 #ifdef NEW_LOGGING
-	LDAP_LOG (( "bind", LDAP_LEVEL_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val ));
+	LDAP_LOG ( OPERATION, ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0);
 #endif
 
+	rc = LOCK_ID(bdb->bi_dbenv, &locker);
+	switch(rc) {
+	case 0:
+		break;
+	default:
+		send_ldap_result( conn, op, rc=LDAP_OTHER,
+			NULL, "internal error", NULL, NULL );
+		return rc;
+	}
+
+dn2entry_retry:
 	/* get entry */
-	rc = bdb_dn2entry_r( be, NULL, ndn, &e, &matched, 0 );
+	rc = bdb_dn2entry_r( be, NULL, ndn, &e, &matched, 0, locker, &lock );
 
 	switch(rc) {
 	case DB_NOTFOUND:
 	case 0:
 		break;
+	case LDAP_BUSY:
+		send_ldap_result( conn, op, LDAP_BUSY,
+			NULL, "ldap server busy", NULL, NULL );
+		LOCK_ID_FREE(bdb->bi_dbenv, locker);
+		return LDAP_BUSY;
+	case DB_LOCK_DEADLOCK:
+	case DB_LOCK_NOTGRANTED:
+		goto dn2entry_retry;
 	default:
 		send_ldap_result( conn, op, rc=LDAP_OTHER,
 			NULL, "internal error", NULL, NULL );
+		LOCK_ID_FREE(bdb->bi_dbenv, locker);
 		return rc;
 	}
 
@@ -71,7 +94,7 @@ bdb_bind(
 				? get_entry_referrals( be, conn, op, matched )
 				: NULL;
 
-			bdb_cache_return_entry_r( &bdb->bi_cache, matched );
+			bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, matched, &lock );
 			matched = NULL;
 
 		} else {
@@ -104,6 +127,8 @@ bdb_bind(
 				NULL, NULL, NULL, NULL );
 		}
 
+		LOCK_ID_FREE(bdb->bi_dbenv, locker);
+
 		ber_bvarray_free( refs );
 		free( matched_dn );
 
@@ -117,7 +142,8 @@ bdb_bind(
 	if ( is_entry_subentry( e ) ) {
 		/* entry is an subentry, don't allow bind */
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "bind", LDAP_LEVEL_DETAIL1, "bdb_bind: entry is subentry\n" ));
+		LDAP_LOG ( OPERATION, DETAIL1, 
+			"bdb_bind: entry is subentry\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "entry is subentry\n", 0,
 			0, 0 );
@@ -134,7 +160,7 @@ bdb_bind(
 	if ( is_entry_alias( e ) ) {
 		/* entry is an alias, don't allow bind */
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "bind", LDAP_LEVEL_DETAIL1, "bdb_bind: entry is alias\n" ));
+		LDAP_LOG ( OPERATION, DETAIL1, "bdb_bind: entry is alias\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
 			0, 0 );
@@ -153,7 +179,8 @@ bdb_bind(
 			conn, op, e );
 
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "bind", LDAP_LEVEL_DETAIL1, "bdb_bind: entry is referral\n" ));
+		LDAP_LOG ( OPERATION, DETAIL1, 
+			"bdb_bind: entry is referral\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
 			0, 0 );
@@ -270,9 +297,11 @@ bdb_bind(
 done:
 	/* free entry and reader lock */
 	if( e != NULL ) {
-		bdb_cache_return_entry_r( &bdb->bi_cache, e );
+		bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
 	}
 
+	LOCK_ID_FREE(bdb->bi_dbenv, locker);
+
 	/* front end with send result on success (rc==0) */
 	return rc;
 }