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

diff --git a/servers/slapd/back-bdb/bind.c b/servers/slapd/back-bdb/bind.c
index 4db11d41c7..7a9230dcdc 100644
--- a/servers/slapd/back-bdb/bind.c
+++ b/servers/slapd/back-bdb/bind.c
@@ -1,7 +1,7 @@
 /* bind.c - bdb backend bind routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -40,25 +40,52 @@ bdb_bind(
 
 	AttributeDescription *password = slap_schema.si_ad_userPassword;
 
+	u_int32_t	locker;
+	DB_LOCK		lock;
+
+#ifdef NEW_LOGGING
+	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( 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;
 	}
 
 	/* get entry with reader lock */
 	if ( e == NULL ) {
 		char *matched_dn = NULL;
-		BVarray refs;
+		BerVarray refs;
 
 		if( matched != NULL ) {
 			matched_dn = ch_strdup( matched->e_dn );
@@ -67,7 +94,7 @@ bdb_bind(
 				? get_entry_referrals( be, conn, op, matched )
 				: NULL;
 
-			bdb_entry_return( be, matched );
+			bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, matched, &lock );
 			matched = NULL;
 
 		} else {
@@ -100,7 +127,9 @@ bdb_bind(
 				NULL, NULL, NULL, NULL );
 		}
 
-		bvarray_free( refs );
+		LOCK_ID_FREE(bdb->bi_dbenv, locker);
+
+		ber_bvarray_free( refs );
 		free( matched_dn );
 
 		return rc;
@@ -109,25 +138,53 @@ bdb_bind(
 	ber_dupbv( edn, &e->e_name );
 
 	/* check for deleted */
+#ifdef BDB_SUBENTRIES
+	if ( is_entry_subentry( e ) ) {
+		/* entry is an subentry, don't allow bind */
+#ifdef NEW_LOGGING
+		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 );
+#endif
+
+		send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
+			NULL, NULL, NULL, NULL );
 
+		goto done;
+	}
+#endif
+
+#ifdef BDB_ALIASES
 	if ( is_entry_alias( e ) ) {
 		/* entry is an alias, don't allow bind */
+#ifdef NEW_LOGGING
+		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 );
+#endif
 
 		send_ldap_result( conn, op, rc = LDAP_ALIAS_PROBLEM,
 			NULL, "entry is alias", NULL, NULL );
 
 		goto done;
 	}
+#endif
 
 	if ( is_entry_referral( e ) ) {
 		/* entry is a referral, don't allow bind */
-		BVarray refs = get_entry_referrals( be,
+		BerVarray refs = get_entry_referrals( be,
 			conn, op, e );
 
+#ifdef NEW_LOGGING
+		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 );
+#endif
 
 		if( refs != NULL ) {
 			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
@@ -138,7 +195,7 @@ bdb_bind(
 				NULL, NULL, NULL, NULL );
 		}
 
-		bvarray_free( refs );
+		ber_bvarray_free( refs );
 
 		goto done;
 	}
@@ -155,7 +212,7 @@ bdb_bind(
 		}
 
 		if ( ! access_allowed( be, conn, op, e,
-			password, NULL, ACL_AUTH ) )
+			password, NULL, ACL_AUTH, NULL ) )
 		{
 			send_ldap_result( conn, op, rc = LDAP_INSUFFICIENT_ACCESS,
 				NULL, NULL, NULL, NULL );
@@ -186,7 +243,7 @@ bdb_bind(
 		}
 
 		if ( ! access_allowed( be, conn, op, e,
-			krbattr, NULL, ACL_AUTH ) )
+			krbattr, NULL, ACL_AUTH, NULL ) )
 		{
 			send_ldap_result( conn, op, rc = LDAP_INSUFFICIENT_ACCESS,
 				NULL, NULL, NULL, NULL );
@@ -240,9 +297,11 @@ bdb_bind(
 done:
 	/* free entry and reader lock */
 	if( e != NULL ) {
-		bdb_entry_return( be, 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;
 }