X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fpasswd.c;h=4988e2512238ec18fc82af4e06a25b1fde51f57d;hb=5d9479a3e82cc1ed5260f26878bf710a3b65faec;hp=3858ac29cb004fc41f0442c95ca93297803d8bb6;hpb=5ab0d4af841ea810d49125ac85bcb46300a655af;p=openldap

diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index 3858ac29cb..4988e25122 100644
--- a/servers/slapd/back-bdb/passwd.c
+++ b/servers/slapd/back-bdb/passwd.c
@@ -38,16 +38,25 @@ bdb_exop_passwd(
 	struct berval id = { 0, NULL };
 	struct berval new = { 0, NULL };
 
-	struct berval *dn;
+	struct berval dn;
+	struct berval ndn;
+
+	u_int32_t	locker;
+	DB_LOCK		lock;
 
 	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 );
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( ACL, ENTRY, 
+		"==>bdb_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0, 0  );
+#else
 	Debug( LDAP_DEBUG_ARGS, "==> bdb_exop_passwd: \"%s\"\n",
 		id.bv_val ? id.bv_val : "", 0, 0 );
+#endif
 
 	if( rc != LDAP_SUCCESS ) {
 		goto done;
@@ -73,21 +82,44 @@ bdb_exop_passwd(
 		goto done;
 	}
 
-	dn = id.bv_val ? &id : &op->o_dn;
+	if( id.bv_len ) {
+		dn = id;
+	} else {
+		dn = op->o_dn;
+	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: \"%s\"%s\"\n",
+		dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: \"%s\"%s\n",
-		dn->bv_val, id.bv_val ? " (proxy)" : "", 0 );
+		dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
+#endif
 
-	if( dn->bv_len == 0 ) {
+	if( dn.bv_len == 0 ) {
 		*text = "No password is associated with the Root DSE";
-		rc = LDAP_OPERATIONS_ERROR;
+		rc = LDAP_UNWILLING_TO_PERFORM;
+		goto done;
+	}
+
+	rc = dnNormalize2( NULL, &dn, &ndn );
+	if( rc != LDAP_SUCCESS ) {
+		*text = "Invalid DN";
 		goto done;
 	}
 
 	if( 0 ) {
 retry:	/* transaction retry */
+		if ( e != NULL ) {
+			bdb_cache_delete_entry(&bdb->bi_cache, e);
+			bdb_cache_return_entry_w(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+		}
+#ifdef NEW_LOGGING
+		LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
-		rc = txn_abort( ltid );
+#endif
+		rc = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
 		if( rc != 0 ) {
@@ -98,28 +130,34 @@ retry:	/* transaction retry */
 		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 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( ACL, ERR, 
+			"bdb_exop_passwd: txn_begin failed: %s (%d)\n", 
+			db_strerror(rc), rc, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_exop_passwd: txn_begin failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
+#endif
+		rc = LDAP_OTHER;
+		*text = "internal error";
+		goto done;
 	}
 
+	locker = TXN_ID ( ltid );
+
 	opinfo.boi_bdb = be;
 	opinfo.boi_txn = ltid;
 	opinfo.boi_err = 0;
 	op->o_private = &opinfo;
 
 	/* get entry */
-	rc = bdb_dn2entry( be, ltid, dn, &e, NULL, 0 );
+	rc = bdb_dn2entry_w( be, ltid, &ndn, &e, NULL, 0 , locker, &lock);
 
 	switch(rc) {
 	case DB_LOCK_DEADLOCK:
@@ -128,6 +166,9 @@ retry:	/* transaction retry */
 	case DB_NOTFOUND:
 	case 0:
 		break;
+	case LDAP_BUSY:
+		*text = "ldap server busy";
+		goto done;
 	default:
 		rc = LDAP_OTHER;
 		*text = "internal error";
@@ -140,18 +181,27 @@ retry:	/* transaction retry */
 		goto done;
 	}
 
+#ifdef BDB_SUBENTRIES
+	if( is_entry_subentry( 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;
 	}
 
@@ -174,10 +224,9 @@ retry:	/* transaction retry */
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			*text = NULL;
-			bdb_entry_return( be, e );
-			e = NULL;
 			goto retry;
 		case 0:
+			*text = NULL;
 			break;
 		default:
 			rc = LDAP_OTHER;
@@ -191,16 +240,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;
@@ -212,15 +263,15 @@ retry:	/* transaction retry */
 
 done:
 	if( e != NULL ) {
-		bdb_entry_return( be, e );
+		bdb_cache_return_entry_w( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
 	}
-
+		
 	if( hash.bv_val != NULL ) {
 		free( hash.bv_val );
 	}
 
 	if( ltid != NULL ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}