X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fpasswd.c;h=181447ca900a86e05c2faaa65e99161dbc976886;hb=190f161d741fb87417d743b64d0100dd6e2c0855;hp=17d54cacc5a733022e1a2d18e0d5cc17a4040e53;hpb=6107ba67d2fd7eadb23ffdd1d284306011ef4013;p=openldap

diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index 17d54cacc5..181447ca90 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-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,25 +12,17 @@
 
 #include "back-bdb.h"
 #include "external.h"
+#include "lber_pvt.h"
 
 int
-bdb_exop_passwd(
-	Backend		*be,
-	Connection		*conn,
-	Operation		*op,
-	const char		*reqoid,
-	struct berval	*reqdata,
-	char			**rspoid,
-	struct berval	**rspdata,
-	LDAPControl		*** rspctrls,
-	const char		**text,
-	BerVarray *refs )
+bdb_exop_passwd( Operation *op, SlapReply *rs )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	int rc;
 	Entry *e = NULL;
+	EntryInfo *ei;
 	struct berval hash = { 0, NULL };
-	DB_TXN *ltid = NULL;
+	DB_TXN *ltid = NULL, *lt2;
 	struct bdb_op_info opinfo;
 	char textbuf[SLAP_TEXT_BUFLEN];
 	size_t textlen = sizeof textbuf;
@@ -38,17 +30,16 @@ bdb_exop_passwd(
 	struct berval id = { 0, NULL };
 	struct berval new = { 0, NULL };
 
-	struct berval dn;
-	struct berval ndn;
+	struct berval dn = { 0, NULL };
+	struct berval ndn = { 0, NULL };
 
-	u_int32_t	locker;
+	u_int32_t	locker = 0;
 	DB_LOCK		lock;
 
-	assert( reqoid != NULL );
-	assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
+	assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->oq_extended.rs_reqoid ) == 0 );
 
-	rc = slap_passwd_parse( reqdata,
-		&id, NULL, &new, text );
+	rc = slap_passwd_parse( op->oq_extended.rs_reqdata,
+		&id, NULL, &new, &rs->sr_text );
 
 #ifdef NEW_LOGGING
 	LDAP_LOG ( ACL, ENTRY, 
@@ -66,18 +57,18 @@ bdb_exop_passwd(
 		slap_passwd_generate(&new);
 
 		if( new.bv_len == 0 ) {
-			*text = "password generation failed.";
+			rs->sr_text = "password generation failed.";
 			rc = LDAP_OTHER;
 			goto done;
 		}
 		
-		*rspdata = slap_passwd_return( &new );
+		rs->sr_rspdata = slap_passwd_return( &new );
 	}
 
-	slap_passwd_hash( &new, &hash );
+	slap_passwd_hash( &new, &hash, &rs->sr_text );
 
 	if( hash.bv_len == 0 ) {
-		*text = "password hash failed";
+		if( !rs->sr_text ) rs->sr_text = "password hash failed";
 		rc = LDAP_OTHER;
 		goto done;
 	}
@@ -97,22 +88,21 @@ bdb_exop_passwd(
 #endif
 
 	if( dn.bv_len == 0 ) {
-		*text = "No password is associated with the Root DSE";
-		rc = LDAP_OPERATIONS_ERROR;
+		rs->sr_text = "No password is associated with the Root DSE";
+		rc = LDAP_UNWILLING_TO_PERFORM;
 		goto done;
 	}
 
-	rc = dnNormalize2( NULL, &dn, &ndn );
+	rc = dnNormalize( 0, NULL, NULL, &dn, &ndn, op->o_tmpmemctx );
 	if( rc != LDAP_SUCCESS ) {
-		*text = "Invalid DN";
+		rs->sr_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);
+			bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
@@ -122,9 +112,10 @@ retry:	/* transaction retry */
 		rc = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
+		op->o_do_not_cache = opinfo.boi_acl_cache;
 		if( rc != 0 ) {
 			rc = LDAP_OTHER;
-			*text = "internal error";
+			rs->sr_text = "internal error";
 			goto done;
 		}
 		ldap_pvt_thread_yield();
@@ -133,7 +124,7 @@ retry:	/* transaction retry */
 	/* begin transaction */
 	rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
 		bdb->bi_db_opflags );
-	*text = NULL;
+	rs->sr_text = NULL;
 	if( rc != 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG ( ACL, ERR, 
@@ -145,19 +136,21 @@ retry:	/* transaction retry */
 			db_strerror(rc), rc, 0 );
 #endif
 		rc = LDAP_OTHER;
-		*text = "internal error";
+		rs->sr_text = "internal error";
 		goto done;
 	}
 
 	locker = TXN_ID ( ltid );
 
-	opinfo.boi_bdb = be;
+	opinfo.boi_bdb = op->o_bd;
 	opinfo.boi_txn = ltid;
+	opinfo.boi_locker = locker;
 	opinfo.boi_err = 0;
+	opinfo.boi_acl_cache = op->o_do_not_cache;
 	op->o_private = &opinfo;
 
 	/* get entry */
-	rc = bdb_dn2entry_w( be, ltid, &ndn, &e, NULL, 0 , locker, &lock);
+	rc = bdb_dn2entry( op->o_bd, ltid, &ndn, &ei, 0 , locker, &lock, op->o_tmpmemctx );
 
 	switch(rc) {
 	case DB_LOCK_DEADLOCK:
@@ -167,24 +160,26 @@ retry:	/* transaction retry */
 	case 0:
 		break;
 	case LDAP_BUSY:
-		*text = "ldap server busy";
+		rs->sr_text = "ldap server busy";
 		goto done;
 	default:
 		rc = LDAP_OTHER;
-		*text = "internal error";
+		rs->sr_text = "internal error";
 		goto done;
 	}
 
+	if ( ei ) e = ei->bei_e;
+
 	if( e == NULL ) {
-		*text = "could not locate authorization entry";
+		rs->sr_text = "could not locate authorization entry";
 		rc = LDAP_NO_SUCH_OBJECT;
 		goto done;
 	}
 
 #ifdef BDB_SUBENTRIES
 	if( is_entry_subentry( e ) ) {
-		/* entry is an alias, don't allow operation */
-		*text = "authorization entry is subentry";
+		/* entry is a subentry, don't allow operation */
+		rs->sr_text = "authorization entry is subentry";
 		rc = LDAP_OTHER;
 		goto done;
 	}
@@ -192,7 +187,7 @@ retry:	/* transaction retry */
 #ifdef BDB_ALIASES
 	if( is_entry_alias( e ) ) {
 		/* entry is an alias, don't allow operation */
-		*text = "authorization entry is alias";
+		rs->sr_text = "authorization entry is alias";
 		rc = LDAP_ALIAS_PROBLEM;
 		goto done;
 	}
@@ -200,56 +195,88 @@ retry:	/* transaction retry */
 
 	if( is_entry_referral( e ) ) {
 		/* entry is an referral, don't allow operation */
-		*text = "authorization entry is referral";
+		rs->sr_text = "authorization entry is referral";
 		rc = LDAP_OTHER;
 		goto done;
 	}
 
+	/* nested transaction */
+	rc = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
+		bdb->bi_db_opflags );
+	rs->sr_text = NULL;
+	if( rc != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"bdb_exop_passwd: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_exop_passwd: txn_begin(2) failed: %s (%d)\n",
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+		rc = LDAP_OTHER;
+		rs->sr_text = "internal error";
+		goto done;
+	}
 	{
 		Modifications ml;
 		struct berval vals[2];
+		Entry dummy, *save;
+
+		save = e;
+		dummy = *e;
+		e = &dummy;
 
 		vals[0] = hash;
 		vals[1].bv_val = NULL;
 
 		ml.sml_desc = slap_schema.si_ad_userPassword;
-		ml.sml_bvalues = vals;
+		ml.sml_values = vals;
+		ml.sml_nvalues = NULL;
 		ml.sml_op = LDAP_MOD_REPLACE;
 		ml.sml_next = NULL;
 
-		rc = bdb_modify_internal( be, conn, op, ltid,
-			&ml, e, text, textbuf, textlen );
+		rc = bdb_modify_internal( op, lt2,
+			&ml, e, &rs->sr_text, textbuf, textlen );
 
+		if ( (rc == LDAP_INSUFFICIENT_ACCESS) && opinfo.boi_err ) {
+			rc = opinfo.boi_err;
+		}
 		switch(rc) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
-			*text = NULL;
+			rs->sr_text = NULL;
 			goto retry;
 		case 0:
-			*text = NULL;
+			rs->sr_text = NULL;
 			break;
 		default:
 			rc = LDAP_OTHER;
-			*text = "entry modify failed";
+			rs->sr_text = "entry modify failed";
 			goto done;
 		}
 
 		/* change the entry itself */
-		rc = bdb_id2entry_update( be, ltid, e );
+		rc = bdb_id2entry_update( op->o_bd, lt2, e );
 		if( rc != 0 ) {
 			switch(rc) {
 			case DB_LOCK_DEADLOCK:
 			case DB_LOCK_NOTGRANTED:
 				goto retry;
 			}
-			*text = "entry update failed";
+			rs->sr_text = "entry update failed";
 			rc = LDAP_OTHER;
 		}
+		if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
+			rc = LDAP_OTHER;
+			rs->sr_text = "txn_commit(2) failed";
+		}
 
 		if( rc == 0 ) {
 			if( op->o_noop ) {
 				rc = TXN_ABORT( ltid );
 			} else {
+				bdb_cache_modify( save, e->e_attrs,
+					bdb->bi_dbenv, locker, &lock );
 				rc = TXN_COMMIT( ltid, 0 );
 			}
 			ltid = NULL;
@@ -257,19 +284,27 @@ retry:	/* transaction retry */
 		op->o_private = NULL;
 
 		if( rc == LDAP_SUCCESS ) {
-			replog( be, op, &e->e_name, &e->e_nname, &ml );
+			op->o_req_dn = e->e_name;
+			op->o_req_ndn = e->e_nname;
+			op->oq_modify.rs_modlist = &ml;
+			replog( op );
+			op->oq_extended.rs_reqoid = slap_EXOP_MODIFY_PASSWD;
 		}
 	}
 
 done:
 	if( e != NULL ) {
-		bdb_cache_return_entry_w( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
+		bdb_unlocked_cache_return_entry_w( &bdb->bi_cache, e );
 	}
 		
 	if( hash.bv_val != NULL ) {
 		free( hash.bv_val );
 	}
 
+	if( ndn.bv_val != NULL ) {
+		op->o_tmpfree( ndn.bv_val, op->o_tmpmemctx );
+	}
+
 	if( ltid != NULL ) {
 		TXN_ABORT( ltid );
 		op->o_private = NULL;