diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2010-11-05 15:06:01 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2010-12-06 16:54:17 -0500 |
| commit | f3166d601becb6fe8235d61bcff465cefbb9dc36 (patch) | |
| tree | e60c37e3f1c1762dd0bce60fb7fb3f3e176083f1 | |
| parent | 426053212c6cf9ccb69147f8e50b57c94ba08a08 (diff) | |
- fix included in 1.9
| -rw-r--r-- | krb5-trunk-explife.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/krb5-trunk-explife.patch b/krb5-trunk-explife.patch deleted file mode 100644 index ddcf143..0000000 --- a/krb5-trunk-explife.patch +++ /dev/null @@ -1,28 +0,0 @@ -Rob Crittenden noticed that, in populate_krb5_db_entry(), key -expirations weren't being computed as expected. It turns out -that neither KDB_PRINC_EXPIRE_TIME_ATTR nor KDB_PWD_EXPIRE_TIME_ATTR -is defined to 1, so the check for their bits could never succeed as -written. RT#6762. - -Index: src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c -=================================================================== ---- src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c (revision 24252) -+++ src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c (working copy) -@@ -2087,7 +2087,7 @@ - goto cleanup; - - if (attr_present == TRUE) { -- if ((mask & KDB_PRINC_EXPIRE_TIME_ATTR) == 1) { -+ if (mask & KDB_PRINC_EXPIRE_TIME_ATTR) { - if (expiretime < entry->expiration) - entry->expiration = expiretime; - } else { -@@ -2127,7 +2127,7 @@ - if ((st=krb5_dbe_lookup_last_pwd_change(context, entry, &last_pw_changed)) != 0) - goto cleanup; - -- if ((mask & KDB_PWD_EXPIRE_TIME_ATTR) == 1) { -+ if (mask & KDB_PWD_EXPIRE_TIME_ATTR) { - if ((last_pw_changed + pw_max_life) < entry->pw_expiration) - entry->pw_expiration = last_pw_changed + pw_max_life; - } else |