drop patch for RT#7836, fixed in 1.12.2
This commit is contained in:
parent
1d44a8f927
commit
d41320b7c1
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user