diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2014-08-15 14:37:18 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@redhat.com> | 2014-08-15 14:37:24 -0400 |
| commit | d41320b7c10ec91d549593a7af5bf7221b37368c (patch) | |
| tree | e979fee23ccb2d436c1a568f8159b6aed595a34f | |
| parent | 1d44a8f9272dbbe2ddeae85d18b8035b9b3126b6 (diff) | |
| download | krb5-d41320b7c10ec91d549593a7af5bf7221b37368c.tar.gz krb5-d41320b7c10ec91d549593a7af5bf7221b37368c.tar.xz krb5-d41320b7c10ec91d549593a7af5bf7221b37368c.zip | |
drop patch for RT#7836, fixed in 1.12.2
| -rw-r--r-- | krb5-master-empty-credstore.patch | 43 | ||||
| -rw-r--r-- | krb5.spec | 3 |
2 files changed, 1 insertions, 45 deletions
diff --git a/krb5-master-empty-credstore.patch b/krb5-master-empty-credstore.patch deleted file mode 100644 index b6cd7ef..0000000 --- a/krb5-master-empty-credstore.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 970304b558a360e08d8421ef92245d2df0ac5e49 -Author: Greg Hudson <ghudson@mit.edu> -Date: Thu Jan 16 11:49:04 2014 -0500 - - Allow empty store in gss_acquire_cred_from - - There is no reason to deny a zero-length cred store, so don't check - for it in val_acq_cred_args or val_add_cred_args. - - ticket: 7836 (new) - target_version: 1.12.2 - tags: pullup - -diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c -index 03b67e3..b9a3142 100644 ---- a/src/lib/gssapi/mechglue/g_acquire_cred.c -+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c -@@ -80,12 +80,6 @@ val_acq_cred_args( - return GSS_S_FAILURE; - } - -- if (cred_store != NULL && cred_store->count == 0) { -- *minor_status = EINVAL; -- map_errcode(minor_status); -- return GSS_S_FAILURE; -- } -- - return (GSS_S_COMPLETE); - } - -@@ -302,12 +296,6 @@ val_add_cred_args( - return GSS_S_FAILURE; - } - -- if (cred_store != NULL && cred_store->count == 0) { -- *minor_status = EINVAL; -- map_errcode(minor_status); -- return GSS_S_FAILURE; -- } -- - return (GSS_S_COMPLETE); - } - @@ -95,7 +95,6 @@ Patch134: krb5-1.11-kpasswdtest.patch Patch136: krb5-master-rcache-internal-const.patch Patch137: krb5-master-rcache-acquirecred-cleanup.patch Patch139: krb5-master-rcache-acquirecred-source.patch -Patch140: krb5-master-empty-credstore.patch Patch141: krb5-master-rcache-acquirecred-test.patch Patch142: krb5-master-move-otp-sockets.patch Patch143: krb5-master-spnego-preserve-oid.patch @@ -351,7 +350,6 @@ ln -s NOTICE LICENSE %patch136 -p1 -b .rcache-internal-const %patch137 -p1 -b .rcache-acquirecred-cleanup %patch139 -p1 -b .rcache-acquirecred-source -%patch140 -p1 -b .empty-credstore %patch141 -p1 -b .rcache-acquirecred-test %patch142 -p1 -b .move-otp-sockets %patch143 -p1 -b .spnego-preserve-oid @@ -1043,6 +1041,7 @@ exit 0 - drop patch for RT#7820, fixed in 1.12.2 - drop patch for #231147, fixed as RT#3277 in 1.12.2 - drop patch for RT#7818, fixed in 1.12.2 + - drop patch for RT#7836, fixed in 1.12.2 - replace older proposed changes for ksu with backports of the changes after review and merging upstream (#1015559, #1026099, #1118347) |