resync with HEAD

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 738d9add84f0b5ec9970f8ee28d61cb549eced88..fee10439dd2f1af387073e6fef9010b262c5f333 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -62,17 +62,33 @@ int passwd_extop(
        assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
 
        if( op->o_dn.bv_len == 0 ) {
+               Statslog( LDAP_DEBUG_STATS, "%s PASSMOD\n",
+                       op->o_log_prefix, 0, 0, 0, 0 );
                rs->sr_text = "only authenticated users may change passwords";
                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;
 
-       rs->sr_err = slap_passwd_parse( op->ore_reqdata, &id, &qpw->rs_old,
-               &qpw->rs_new, &rs->sr_text );
+       rs->sr_err = slap_passwd_parse( op->ore_reqdata, &id,
+               &qpw->rs_old, &qpw->rs_new, &rs->sr_text );
+
+       if ( rs->sr_err == LDAP_SUCCESS && !BER_BVISEMPTY( &id ) ) {
+               Statslog( LDAP_DEBUG_STATS, "%s PASSMOD id=\"%s\"%s%s\n",
+                       op->o_log_prefix, id.bv_val,
+                       qpw->rs_old.bv_val ? " old" : "",
+                       qpw->rs_new.bv_val ? " new" : "", 0 );
+       } else {
+               Statslog( LDAP_DEBUG_STATS, "%s PASSMOD %s%s\n",
+                       op->o_log_prefix,
+                       qpw->rs_old.bv_val ? " old" : "",
+                       qpw->rs_new.bv_val ? " new" : "", 0, 0 );
+       }
 
        if ( rs->sr_err != LDAP_SUCCESS ) {
                return rs->sr_err;
@@ -97,6 +113,12 @@ int passwd_extop(
        }
 
        if( op->o_bd == NULL ) {
+               if ( qpw->rs_old.bv_val != NULL ) {
+                       rs->sr_text = "unwilling to verify old password";
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       goto error_return;
+               }
+
 #ifdef HAVE_CYRUS_SASL
                rc = slap_sasl_setpass( op, rs );
 #else
@@ -188,6 +210,28 @@ int passwd_extop(
                goto error_return;
        }
 
+       if ( qpw->rs_old.bv_val != NULL ) {
+               Entry *e = NULL;
+
+               rc = be_entry_get_rw( op, &op->o_req_ndn, NULL,
+                       slap_schema.si_ad_userPassword, 0, &e );
+               if ( rc == LDAP_SUCCESS && e ) {
+                       Attribute *a = attr_find( e->e_attrs,
+                               slap_schema.si_ad_userPassword );
+                       if ( a )
+                               rc = slap_passwd_check( op, e, a, &qpw->rs_old, &rs->sr_text );
+                       else
+                               rc = 1;
+                       be_entry_release_r( op, e );
+                       if ( rc == LDAP_SUCCESS )
+                               goto old_good;
+               }
+               rs->sr_text = "unwilling to verify old password";
+               rc = LDAP_UNWILLING_TO_PERFORM;
+               goto error_return;
+       }
+
+old_good:
        ml = ch_malloc( sizeof(Modifications) );
        if ( !qpw->rs_modtail ) qpw->rs_modtail = &ml->sml_next;
 
@@ -229,12 +273,7 @@ int passwd_extop(
                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 ) {
@@ -337,6 +376,15 @@ int slap_passwd_parse( struct berval *reqdata,
                        goto decoding_error;
                }
 
+               if( oldpass->bv_len == 0 ) {
+                       Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD empty.\n",
+                               0, 0, 0 );
+
+                       *text = "old password value is empty";
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       goto done;
+               }
+
                tag = ber_peek_tag( ber, &len );
        }
 
@@ -359,6 +407,15 @@ int slap_passwd_parse( struct berval *reqdata,
                        goto decoding_error;
                }
 
+               if( newpass->bv_len == 0 ) {
+                       Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW empty.\n",
+                               0, 0, 0 );
+
+                       *text = "new password value is empty";
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       goto done;
+               }
+
                tag = ber_peek_tag( ber, &len );
        }