From: Tom Yu <tlyu@mit.edu>
Date: Mon, 31 Jan 2011 22:44:22 +0000 (+0000)
Subject: pull up r24601 from trunk
X-Git-Tag: krb5-1.9.1-beta1~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11c89079f861c492e1ea11d593edf5354e5ec38b;p=krb5.git

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.

ticket: 6849
version_fixed: 1.9.1
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24609 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
index 509c692e6..a218dc7e0 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
@@ -196,6 +196,7 @@ krb5_ldap_lockout_audit(krb5_context context,
             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 &&