diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
commit | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (patch) | |
tree | 6dfcf9c3c4143226d0ef65ce2d139f80f8fcacc1 /testing/krb5/krb5-1.9.1-2011-006.patch | |
parent | 40e1222c1402c0d2aded73b95802f8197d0691a6 (diff) | |
parent | 9343f37ee7ba1aa98f65272412d331a280890e12 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/epdfview/PKGBUILD
community/gpa/PKGBUILD
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/lmctl/PKGBUILD
community/mediatomb/PKGBUILD
community/ruby-atk/PKGBUILD
community/ruby-gdkpixbuf2/PKGBUILD
community/ruby-gio2/PKGBUILD
community/ruby-glib2/PKGBUILD
community/ruby-pango/PKGBUILD
core/eglibc/glibc-2.10-bz4781.patch
core/eglibc/glibc-2.10-dont-build-timezone.patch
core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
core/eglibc/glibc-2.13-futex.patch
core/eglibc/glibc-__i686.patch
extra/silc-toolkit/PKGBUILD
Diffstat (limited to 'testing/krb5/krb5-1.9.1-2011-006.patch')
-rw-r--r-- | testing/krb5/krb5-1.9.1-2011-006.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/testing/krb5/krb5-1.9.1-2011-006.patch b/testing/krb5/krb5-1.9.1-2011-006.patch deleted file mode 100644 index 05a22caf5..000000000 --- a/testing/krb5/krb5-1.9.1-2011-006.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c -index b473611..50c60b7 100644 ---- a/src/plugins/kdb/db2/lockout.c -+++ b/src/plugins/kdb/db2/lockout.c -@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context, - return 0; - } - -+ if (entry == NULL) -+ return 0; -+ - if (!db_ctx->disable_lockout) { - code = lookup_lockout_policy(context, entry, &max_fail, - &failcnt_interval, &lockout_duration); -@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context, - return code; - } - -+ /* -+ * Don't continue to modify the DB for an already locked account. -+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and -+ * this check is unneeded, but in rare cases, we can fail with an -+ * integrity error or preauth failure before a policy check.) -+ */ -+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) -+ return 0; -+ - /* Only mark the authentication as successful if the entry - * required preauthentication, otherwise we have no idea. */ - if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) { -diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c -index 552e39a..c2f44ab 100644 ---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c -+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c -@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor, - CHECK_LDAP_HANDLE(ldap_context); - - if (is_principal_in_realm(ldap_context, searchfor) != 0) { -+ st = KRB5_KDB_NOENTRY; - krb5_set_error_message (context, st, "Principal does not belong to realm"); - goto cleanup; - } -diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c -index a218dc7..fd164dd 100644 ---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c -+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c -@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context, - return 0; - } - -+ if (entry == NULL) -+ return 0; -+ - if (!ldap_context->disable_lockout) { - code = lookup_lockout_policy(context, entry, &max_fail, - &failcnt_interval, -@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context, - return code; - } - -- entry->mask = 0; -+ /* -+ * Don't continue to modify the DB for an already locked account. -+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and -+ * this check is unneeded, but in rare cases, we can fail with an -+ * integrity error or preauth failure before a policy check.) -+ */ -+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) -+ return 0; - -- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry)); -+ entry->mask = 0; - - /* Only mark the authentication as successful if the entry - * required preauthentication, otherwise we have no idea. */ |