svn rev #24609: branches/krb5-1-9/src/plugins/kdb/ldap/libkdb_ldap/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24609
Commit By: tlyu
Log Message:
ticket: 6849
version_fixed: 1.9.1
status: resolved

pull up r24601 from trunk

 ------------------------------------------------------------------------
 r24601 | ghudson | 2011-01-21 00:00:53 -0500 (Fri, 21 Jan 2011) | 8 lines

 ticket: 6849
 subject: Fix edge case in LDAP last_admin_unlock processing
 target_version: 1.9.1
 tags: pullup

 In the LDAP KDB module, set appropriate flags when zeroing
 entry->fail_auth_count due to an administrative unlock.


Changed Files:
U   branches/krb5-1-9/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
Modified: branches/krb5-1-9/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
===================================================================
--- branches/krb5-1-9/src/plugins/kdb/ldap/libkdb_ldap/lockout.c	2011-01-31 22:44:18 UTC (rev 24608)
+++ branches/krb5-1-9/src/plugins/kdb/ldap/libkdb_ldap/lockout.c	2011-01-31 22:44:22 UTC (rev 24609)
@@ -196,6 +196,7 @@
             entry->last_failed <= unlock_time) {
             /* Reset fail_auth_count after administrative unlock. */
             entry->fail_auth_count = 0;
+            entry->mask |= KADM5_FAIL_AUTH_COUNT;
         }
 
         if (failcnt_interval != 0 &&