Added ppolicy_hide_lockout keyword

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 8b358c6d47562c5e8577eb3e45d413414e598a40..a70fcc2102dda0c1205cab669c3b3886a65af4e4 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -180,28 +180,10 @@ int passwd_extop(
        ml->sml_values[i].bv_val = NULL;
        ml->sml_nvalues = NULL;
        ml->sml_desc = slap_schema.si_ad_userPassword;
-       ml->sml_op = qpw->rs_old.bv_val ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
+       ml->sml_op = LDAP_MOD_REPLACE;
        ml->sml_next = qpw->rs_mods;
        qpw->rs_mods = ml;
-       if ( qpw->rs_old.bv_val ) {
-               ml = ch_malloc( sizeof(Modifications) );
-               ml->sml_values = ch_malloc( (nhash+1)*sizeof(struct berval) );
-               for ( i=0; hashes[i]; i++ ) {
-                       slap_passwd_hash_type( &qpw->rs_old, &hash, hashes[i], &rs->sr_text );
-                       if ( hash.bv_len == 0 ) {
-                               if ( !rs->sr_text ) {
-                                       rs->sr_text = "password hash failed";
-                               }
-                               break;
-                       }
-                       ml->sml_values[i] = hash;
-               }
-               ml->sml_values[i].bv_val = NULL;
-               ml->sml_desc = slap_schema.si_ad_userPassword;
-               ml->sml_op = LDAP_MOD_DELETE;
-               ml->sml_next = qpw->rs_mods;
-               qpw->rs_mods = ml;
-       }
+
        if ( hashes[i] ) {
                rs->sr_err = LDAP_OTHER;
        } else {