mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#4134 delete pwdFailureTime on password reset

Browse Source
This commit is contained in:
Howard Chu 2005-11-03 00:35:46 +00:00
parent 9ee48976e2
commit 82db113f32
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
servers/slapd/overlays/ppolicy.c
View File

@ -1179,11 +1179,12 @@ ppolicy_modify( Operation *op, SlapReply *rs )
*/ */
if ( be_shadow_update( op )) { if ( be_shadow_update( op )) {
Modifications **prev; Modifications **prev;
int got_del_grace = 0, got_del_lock = 0, got_pw = 0; int got_del_grace = 0, got_del_lock = 0, got_pw = 0, got_del_fail = 0;
Attribute *a_grace, *a_lock; Attribute *a_grace, *a_lock, *a_fail;
a_grace = attr_find( e->e_attrs, ad_pwdGraceUseTime ); a_grace = attr_find( e->e_attrs, ad_pwdGraceUseTime );
a_lock = attr_find( e->e_attrs, ad_pwdAccountLockedTime ); a_lock = attr_find( e->e_attrs, ad_pwdAccountLockedTime );
a_fail = attr_find( e->e_attrs, ad_pwdFailureTime );
for( prev = &op->oq_modify.rs_modlist, ml = *prev; ml; for( prev = &op->oq_modify.rs_modlist, ml = *prev; ml;
prev = &ml->sml_next, ml = *prev ) { prev = &ml->sml_next, ml = *prev ) {
@ -1206,6 +1207,11 @@ ppolicy_modify( Operation *op, SlapReply *rs )
got_del_lock = 1; got_del_lock = 1;
if ( !a_lock ) if ( !a_lock )
drop = 1; drop = 1;
} else
if ( ml->sml_desc == ad_pwdFailureTime ) {
got_del_fail = 1;
if ( !a_fail )
drop = 1;
} }
if ( drop ) { if ( drop ) {
*prev = ml->sml_next; *prev = ml->sml_next;
@ -1215,8 +1221,8 @@ ppolicy_modify( Operation *op, SlapReply *rs )
} }
} }
/* If we're resetting the password, make sure grace and accountlock /* If we're resetting the password, make sure grace, accountlock,
* also get removed. * and failure also get removed.
*/ */
if ( got_pw ) { if ( got_pw ) {
if ( a_grace && !got_del_grace ) { if ( a_grace && !got_del_grace ) {
@ -1242,6 +1248,17 @@ ppolicy_modify( Operation *op, SlapReply *rs )
ml->sml_next = NULL; ml->sml_next = NULL;
*prev = ml; *prev = ml;
} }
if ( a_fail && !got_del_fail ) {
ml = (Modifications *) ch_malloc( sizeof( Modifications ) );
ml->sml_op = LDAP_MOD_DELETE;
ml->sml_flags = SLAP_MOD_INTERNAL;
ml->sml_type.bv_val = NULL;
ml->sml_desc = ad_pwdFailureTime;
ml->sml_values = NULL;
ml->sml_nvalues = NULL;
ml->sml_next = NULL;
*prev = ml;
}
} }
op->o_bd->bd_info = (BackendInfo *)on->on_info; op->o_bd->bd_info = (BackendInfo *)on->on_info;
be_entry_release_r( op, e ); be_entry_release_r( op, e );