rpms/krb5
6
0
Fork 0
Code Issues Pull Requests Releases Activity

drop patch for RT#7818, fixed in 1.12.2

Browse Source
This commit is contained in:
Nalin Dahyabhai 2014-08-15 14:35:45 -04:00
parent f543a683b0
commit 1d44a8f927
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
krb5-master-rcache-acquirecred-leak.patch
View File

@ -1,26 +0,0 @@
commit 9df0c4bdce6b88a01af51e4bbb9a365db00256d5
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Jan 15 14:41:54 2014 -0500
Clean up rcache if GSS krb5 acquire_cred fails
The error handler in acquire_cred_context didn't release the rcache,
which would cause it to leak if we failed after acquire_accept_cred.
ticket: 7818 (new)
target_version: 1.12.2
tags: pullup
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index 37cc6b5..f625c0c 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -829,6 +829,8 @@ error_out:
if (cred->keytab)
krb5_kt_close(context, cred->keytab);
#endif /* LEAN_CLIENT */
+ if (cred->rcache)
+ krb5_rc_close(context, cred->rcache);
if (cred->name)
kg_release_name(context, &cred->name);
k5_mutex_destroy(&cred->lock);

5
krb5.spec
View File

@ -94,7 +94,6 @@ Patch129: krb5-1.11-run_user_0.patch
Patch134: krb5-1.11-kpasswdtest.patch Patch134: krb5-1.11-kpasswdtest.patch
Patch136: krb5-master-rcache-internal-const.patch Patch136: krb5-master-rcache-internal-const.patch
Patch137: krb5-master-rcache-acquirecred-cleanup.patch Patch137: krb5-master-rcache-acquirecred-cleanup.patch
Patch138: krb5-master-rcache-acquirecred-leak.patch
Patch139: krb5-master-rcache-acquirecred-source.patch Patch139: krb5-master-rcache-acquirecred-source.patch
Patch140: krb5-master-empty-credstore.patch Patch140: krb5-master-empty-credstore.patch
Patch141: krb5-master-rcache-acquirecred-test.patch Patch141: krb5-master-rcache-acquirecred-test.patch
@ -351,7 +350,6 @@ ln -s NOTICE LICENSE
%patch136 -p1 -b .rcache-internal-const %patch136 -p1 -b .rcache-internal-const
%patch137 -p1 -b .rcache-acquirecred-cleanup %patch137 -p1 -b .rcache-acquirecred-cleanup
%patch138 -p1 -b .rcache-acquirecred-leak
%patch139 -p1 -b .rcache-acquirecred-source %patch139 -p1 -b .rcache-acquirecred-source
%patch140 -p1 -b .empty-credstore %patch140 -p1 -b .empty-credstore
%patch141 -p1 -b .rcache-acquirecred-test %patch141 -p1 -b .rcache-acquirecred-test
@ -1042,8 +1040,9 @@ exit 0
%changelog %changelog
* Fri Aug 15 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.2-1 * Fri Aug 15 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.2-1
- update to 1.12.2 - update to 1.12.2
- drop patch for RT#7820, merged in 1.12.2 - 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 #231147, fixed as RT#3277 in 1.12.2
- drop patch for RT#7818, fixed in 1.12.2
- replace older proposed changes for ksu with backports of the changes - replace older proposed changes for ksu with backports of the changes
after review and merging upstream (#1015559, #1026099, #1118347) after review and merging upstream (#1015559, #1026099, #1118347)