revert erroneous commit; cure the test the right way

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 1cf5a0444fbd7d3dae8d13dcfbc74e4c0e870e62..9e0641209ffff3a015ab0631c9c52697128f4056 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -134,8 +134,9 @@ ldap_back_exop_passwd(
        }
 
        rc = ldap_passwd(lc->ld, isproxy ? &mdn : NULL,
-               qpw->rs_old.bv_len ? &qpw->rs_old : NULL,
-               qpw->rs_new.bv_len ? &qpw->rs_new : NULL, op->o_ctrls, NULL, &msgid);
+               qpw->rs_old.bv_val ? &qpw->rs_old : NULL,
+               qpw->rs_new.bv_val ? &qpw->rs_new : NULL,
+               op->o_ctrls, NULL, &msgid);
 
        if (mdn.bv_val != op->o_req_dn.bv_val) {
                free(mdn.bv_val);

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index d2a85f818ce90d074983930f847b47f393ea8a9e..bfb271b675cd03f58d5b2d7a6d1bb90016ad2039 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -59,9 +59,7 @@ 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;