X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fpasswd.c;h=bec86197894430933f815cbd5ff677c2b8bbcab5;hb=6df9b5459294bcc9adf27f048508d43eea58a203;hp=a2fd83f535fc53264fd1d797bef39721cf35261b;hpb=f52cc9bab51e427afa3ed5d28be012d8da27a7a8;p=openldap

diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index a2fd83f535..bec8619789 100644
--- a/servers/slapd/back-bdb/passwd.c
+++ b/servers/slapd/back-bdb/passwd.c
@@ -1,7 +1,7 @@
 /* passwd.c - bdb backend password routines */
 /* $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
  */
 
@@ -24,7 +24,7 @@ bdb_exop_passwd(
 	struct berval	**rspdata,
 	LDAPControl		*** rspctrls,
 	const char		**text,
-	BVarray *refs )
+	BerVarray *refs )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	int rc;
@@ -41,7 +41,7 @@ bdb_exop_passwd(
 	struct berval *dn;
 
 	assert( reqoid != NULL );
-	assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
+	assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
 
 	rc = slap_passwd_parse( reqdata,
 		&id, NULL, &new, text );
@@ -86,8 +86,12 @@ bdb_exop_passwd(
 
 	if( 0 ) {
 retry:	/* transaction retry */
+		if ( e != NULL ) {
+			bdb_cache_delete_entry(&bdb->bi_cache, e);
+			bdb_cache_return_entry_w(&bdb->bi_cache, e);
+		}
 		Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
-		rc = txn_abort( ltid );
+		rc = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
 		if( rc != 0 ) {
@@ -95,21 +99,20 @@ retry:	/* transaction retry */
 			*text = "internal error";
 			goto done;
 		}
+		ldap_pvt_thread_yield();
 	}
 
-	if( bdb->bi_txn ) {
-		/* begin transaction */
-		rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
-			bdb->bi_db_opflags );
-		*text = NULL;
-		if( rc != 0 ) {
-			Debug( LDAP_DEBUG_TRACE,
-				"bdb_exop_passwd: txn_begin failed: %s (%d)\n",
-				db_strerror(rc), rc, 0 );
-			rc = LDAP_OTHER;
-			*text = "internal error";
-			goto done;
-		}
+	/* begin transaction */
+	rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+		bdb->bi_db_opflags );
+	*text = NULL;
+	if( rc != 0 ) {
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_exop_passwd: txn_begin failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
+		rc = LDAP_OTHER;
+		*text = "internal error";
+		goto done;
 	}
 
 	opinfo.boi_bdb = be;
@@ -118,7 +121,7 @@ retry:	/* transaction retry */
 	op->o_private = &opinfo;
 
 	/* get entry */
-	rc = bdb_dn2entry( be, ltid, dn, &e, NULL, 0 );
+	rc = bdb_dn2entry_w( be, ltid, dn, &e, NULL, 0 );
 
 	switch(rc) {
 	case DB_LOCK_DEADLOCK:
@@ -139,18 +142,27 @@ retry:	/* transaction retry */
 		goto done;
 	}
 
+#ifdef BDB_SUBENTRIES
+	if( is_entry_subentries( e ) ) {
+		/* entry is an alias, don't allow operation */
+		*text = "authorization entry is subentry";
+		rc = LDAP_OTHER;
+		goto done;
+	}
+#endif
+#ifdef BDB_ALIASES
 	if( is_entry_alias( e ) ) {
 		/* entry is an alias, don't allow operation */
 		*text = "authorization entry is alias";
 		rc = LDAP_ALIAS_PROBLEM;
 		goto done;
 	}
-
+#endif
 
 	if( is_entry_referral( e ) ) {
 		/* entry is an referral, don't allow operation */
 		*text = "authorization entry is referral";
-		rc = LDAP_OPERATIONS_ERROR;
+		rc = LDAP_OTHER;
 		goto done;
 	}
 
@@ -173,8 +185,6 @@ retry:	/* transaction retry */
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			*text = NULL;
-			bdb_entry_return( be, e );
-			e = NULL;
 			goto retry;
 		case 0:
 			break;
@@ -190,16 +200,18 @@ retry:	/* transaction retry */
 			switch(rc) {
 			case DB_LOCK_DEADLOCK:
 			case DB_LOCK_NOTGRANTED:
-				bdb_entry_return( be, e );
-				e = NULL;
 				goto retry;
 			}
 			*text = "entry update failed";
 			rc = LDAP_OTHER;
 		}
 
-		if( bdb->bi_txn && rc == 0 ) {
-			rc = txn_commit( ltid, 0 );
+		if( rc == 0 ) {
+			if( op->o_noop ) {
+				rc = TXN_ABORT( ltid );
+			} else {
+				rc = TXN_COMMIT( ltid, 0 );
+			}
 			ltid = NULL;
 		}
 		op->o_private = NULL;
@@ -211,23 +223,15 @@ retry:	/* transaction retry */
 
 done:
 	if( e != NULL ) {
-		bdb_entry_return( be, e );
+		bdb_cache_return_entry_w( &bdb->bi_cache, e );
 	}
-
-	if( id.bv_val != NULL ) {
-		free( id.bv_val );
-	}
-
-	if( new.bv_val != NULL ) {
-		free( new.bv_val );
-	}
-
+		
 	if( hash.bv_val != NULL ) {
 		free( hash.bv_val );
 	}
 
 	if( ltid != NULL ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}