diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-09 10:55:19 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-09 10:55:19 -0300 |
commit | 149750d28420a7b59fab5501ab9aaca095f6fa46 (patch) | |
tree | b263a29e10663635bb00dff7dde4c7c7ac8f30d7 /core/krb5/krb5-1.9.1-2011-006.patch | |
parent | 1c0a9e2b2298f550629181080e63053fcb440743 (diff) | |
parent | 7a3611f5caa5e34c1f2b582640f97b733110ae63 (diff) |
Lots of removed PKGBUILDs, kept mplayer2
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community/acpitool/PKGBUILD
community/amaya/PKGBUILD
community/apparix/PKGBUILD
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/bmpanel/PKGBUILD
community/clipgrab/PKGBUILD
community/compizconfig-backend-kconfig4/PKGBUILD
community/conkeror-git/PKGBUILD
community/cross-arm-elf-binutils/PKGBUILD
community/cross-arm-elf-gcc-base/PKGBUILD
community/cross-arm-wince-cegcc-binutils/PKGBUILD
community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD
community/cross-arm-wince-cegcc-cegccdll/PKGBUILD
community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD
community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
community/cross-arm-wince-cegcc-gcc/PKGBUILD
community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD
community/cross-arm-wince-cegcc-newlib/PKGBUILD
community/cross-arm-wince-cegcc-profile/PKGBUILD
community/cross-arm-wince-cegcc-w32api/PKGBUILD
community/dar/PKGBUILD
community/driftnet/PKGBUILD
community/duff/PKGBUILD
community/dvdstyler/PKGBUILD
community/eiciel/PKGBUILD
community/emesene/PKGBUILD
community/eterm/PKGBUILD
community/extrema/PKGBUILD
community/fail2ban/PKGBUILD
community/fgetty/PKGBUILD
community/fio/PKGBUILD
community/flvstreamer/PKGBUILD
community/fotoxx/PKGBUILD
community/ghdl/PKGBUILD
community/gnofract4d/PKGBUILD
community/gnome-do/PKGBUILD
community/grass/PKGBUILD
community/gri/PKGBUILD
community/gromacs/PKGBUILD
community/gtk-gnutella/PKGBUILD
community/gtk-rezlooks-engine/PKGBUILD
community/handbrake/PKGBUILD
community/jogl/PKGBUILD
community/kydpdict/PKGBUILD
community/libast/PKGBUILD
community/libcgi/PKGBUILD
community/libxnvctrl/PKGBUILD
community/mhwaveedit/PKGBUILD
community/microblog-purple/PKGBUILD
community/mms_client/PKGBUILD
community/mplayer2/PKGBUILD
community/multiget/PKGBUILD
community/multimux/PKGBUILD
community/musescore/PKGBUILD
community/mysql-ruby/PKGBUILD
community/mysql-workbench/PKGBUILD
community/nas/PKGBUILD
community/ocaml-extlib/PKGBUILD
community/ocaml-ounit/PKGBUILD
community/paraview/fix-boost-graph-api-changes.diff
community/pcb/PKGBUILD
community/pdftrans/PKGBUILD
community/python-daap/PKGBUILD
community/python2-cheetah/PKGBUILD
community/qdevelop/PKGBUILD
community/qtoctave/PKGBUILD
community/rep-gtk/PKGBUILD
community/sauerbraten/PKGBUILD
community/sawfish/PKGBUILD
community/scilab/PKGBUILD
community/superswitcher/PKGBUILD
community/tagtool/PKGBUILD
community/tora/PKGBUILD
community/wml/PKGBUILD
community/wxsvg/PKGBUILD
community/xskat/PKGBUILD
core/eglibc/glibc.install
core/eglibc/locale-gen
core/eglibc/locale.gen.txt
core/eglibc/nscd
core/syslog-ng/PKGBUILD
extra/blender/PKGBUILD
extra/cups/PKGBUILD
extra/hplip/PKGBUILD
extra/kile/PKGBUILD
extra/monodevelop-debugger-mdb/PKGBUILD
extra/perl-ev/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/kaffeine/kaffeine.install
testing/kdebase-runtime/PKGBUILD
testing/kdebase-runtime/kdebase-runtime.install
testing/kdebase-runtime/libqzeitgeist08.patch
testing/libdrm/PKGBUILD
testing/libdrm/no-pthread-stubs.patch
Diffstat (limited to 'core/krb5/krb5-1.9.1-2011-006.patch')
-rw-r--r-- | core/krb5/krb5-1.9.1-2011-006.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/core/krb5/krb5-1.9.1-2011-006.patch b/core/krb5/krb5-1.9.1-2011-006.patch deleted file mode 100644 index 05a22caf5..000000000 --- a/core/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. */ |