struct berval **rspdata,
LDAPControl *** rspctrls,
const char **text,
- BVarray *refs )
+ BerVarray *refs )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int rc;
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 );
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 ) {
*text = "internal error";
goto done;
}
+ ldap_pvt_thread_yield();
}
- if( bdb->bi_txn ) {
- /* begin transaction */
- rc = txn_begin( bdb->bi_dbenv, NULL, <id,
- 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, <id,
+ 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;
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:
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;
}
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
*text = NULL;
- bdb_entry_return( be, e );
- e = NULL;
goto retry;
case 0:
break;
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;
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;
}