diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-01-17 10:48:08 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-01-17 10:48:08 -0500 |
| commit | 8ae5258eb36efad37153caf7bd7ba5422f340867 (patch) | |
| tree | 7af7fad9019dee7e8230acaca456d0fbb72b7882 | |
| parent | 29afef6c24c3c52cbb34968a89711e87ed73c429 (diff) | |
| download | krb5-8ae5258eb36efad37153caf7bd7ba5422f340867.tar.gz krb5-8ae5258eb36efad37153caf7bd7ba5422f340867.tar.xz krb5-8ae5258eb36efad37153caf7bd7ba5422f340867.zip | |
Drop obsolete patch
| -rw-r--r-- | krb5-master-spnego_error_messages.patch | 44 | ||||
| -rw-r--r-- | krb5.spec | 3 |
2 files changed, 1 insertions, 46 deletions
diff --git a/krb5-master-spnego_error_messages.patch b/krb5-master-spnego_error_messages.patch deleted file mode 100644 index 6840708..0000000 --- a/krb5-master-spnego_error_messages.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 4faca53e3a8ee213d43da8998f6889e7bfd36248 -Author: Greg Hudson <ghudson@mit.edu> -Date: Wed Dec 18 16:03:16 2013 -0500 - - Test SPNEGO error message in t_s4u.py - - Now that #7045 is fixed, we can check for the correct error message - from t_s4u2proxy_krb5 with --spnego. - - ticket: 7045 - -diff --git a/src/tests/gssapi/t_s4u.py b/src/tests/gssapi/t_s4u.py -index 67dc810..e4aa259 100644 ---- a/src/tests/gssapi/t_s4u.py -+++ b/src/tests/gssapi/t_s4u.py -@@ -30,12 +30,12 @@ if ('auth1: ' + realm.user_princ not in output or - 'NOT_ALLOWED_TO_DELEGATE' not in output): - fail('krb5 -> s4u2proxy') - --# Again with SPNEGO. Bug #7045 prevents us from checking the error --# message, but we can at least exercise the code. -+# Again with SPNEGO. - output = realm.run(['./t_s4u2proxy_krb5', '--spnego', usercache, storagecache, - '-', pservice1, pservice2], - expected_code=1) --if ('auth1: ' + realm.user_princ not in output): -+if ('auth1: ' + realm.user_princ not in output or -+ 'NOT_ALLOWED_TO_DELEGATE' not in output): - fail('krb5 -> s4u2proxy (SPNEGO)') - - # Try krb5 -> S4U2Proxy without forwardable user creds. This should -@@ -66,10 +66,9 @@ if 'NOT_ALLOWED_TO_DELEGATE' not in output: - fail('s4u2self') - - # Again with SPNEGO. This uses SPNEGO for the initial authentication, --# but still uses krb5 for S4U2Proxy (the delegated cred is returned as -+# but still uses krb5 for S4U2Proxy--the delegated cred is returned as - # a krb5 cred, not a SPNEGO cred, and t_s4u uses the delegated cred --# directly rather than saving and reacquiring it) so bug #7045 does --# not apply and we can verify the error message. -+# directly rather than saving and reacquiring it. - output = realm.run(['./t_s4u', '--spnego', puser, pservice2], expected_code=1) - if 'NOT_ALLOWED_TO_DELEGATE' not in output: - fail('s4u2self') @@ -90,7 +90,6 @@ Patch86: krb5-1.9-debuginfo.patch Patch105: krb5-kvno-230379.patch Patch129: krb5-1.11-run_user_0.patch Patch134: krb5-1.11-kpasswdtest.patch -Patch140: krb5-master-spnego_error_messages.patch Patch141: krb5-1.12-enable-NX.patch Patch142: krb5-1.12-pic-aes-ni.patch @@ -311,7 +310,6 @@ ln -s NOTICE LICENSE %patch71 -p1 -b .dirsrv-accountlock %{?_rawbuild} %patch86 -p0 -b .debuginfo %patch105 -p1 -b .kvno -%patch140 -p1 -b .spnego_error_messages %patch141 -p1 -b .enable-NX %patch142 -p1 -b .pic-aes-ni @@ -975,6 +973,7 @@ exit 0 - drop patch for RT#7803, included now - drop patch for RT#7805, included now - drop patch for RT#7807, included now + - drop patch for RT#7045, included now * Mon Jan 13 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12-11 - update the PIC patch for iaesx86.s to not use ELF relocations to the version |