Multi-threaded slapindex

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index c8f8ce75b510b2e3350c61250f5857221eacf7b6..fee10439dd2f1af387073e6fef9010b262c5f333 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -68,7 +68,9 @@ int passwd_extop(
                return LDAP_STRONG_AUTH_REQUIRED;
        }
 
+       qpw->rs_old.bv_len = 0;
        qpw->rs_old.bv_val = NULL;
+       qpw->rs_new.bv_len = 0;
        qpw->rs_new.bv_val = NULL;
        qpw->rs_mods = NULL;
        qpw->rs_modtail = NULL;
@@ -271,12 +273,7 @@ old_good:
                cb2.sc_private = qpw;   /* let Modify know this was pwdMod,
                                         * if it cares... */
 
-               rs->sr_err = slap_mods_opattrs( op, ml, qpw->rs_modtail, &rs->sr_text,
-                       NULL, 0, 1 );
-               
-               if ( rs->sr_err == LDAP_SUCCESS ) {
-                       rs->sr_err = op->o_bd->be_modify( op, rs );
-               }
+               rs->sr_err = op->o_bd->be_modify( op, rs );
                if ( rs->sr_err == LDAP_SUCCESS ) {
                        rs->sr_rspdata = rsp;
                } else if ( rsp ) {