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_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;
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;
}
retry: /* transaction retry */
if ( e != NULL ) {
bdb_cache_delete_entry(&bdb->bi_cache, e);
- bdb_cache_return_entry_w(&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 );
+#endif
rc = TXN_ABORT( ltid );
ltid = NULL;
op->o_private = NULL;
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_w( be, ltid, dn, &e, NULL, 0 );
+ rc = bdb_dn2entry_w( be, ltid, &ndn, &e, NULL, 0 , locker, &lock);
switch(rc) {
case DB_LOCK_DEADLOCK:
case DB_NOTFOUND:
case 0:
break;
+ case LDAP_BUSY:
+ *text = "ldap server busy";
+ goto done;
default:
rc = LDAP_OTHER;
*text = "internal error";
}
#ifdef BDB_SUBENTRIES
- if( is_entry_subentries( e ) ) {
+ if( is_entry_subentry( e ) ) {
/* entry is an alias, don't allow operation */
*text = "authorization entry is subentry";
rc = LDAP_OTHER;
*text = NULL;
goto retry;
case 0:
+ *text = NULL;
break;
default:
rc = LDAP_OTHER;
done:
if( e != NULL ) {
- bdb_cache_return_entry_w( &bdb->bi_cache, e );
+ bdb_cache_return_entry_w( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
}
if( hash.bv_val != NULL ) {