diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-01-17 10:08:58 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-01-17 10:08:58 -0500 |
| commit | 6a8573e3afe7706da637326f671f127336ebdaed (patch) | |
| tree | 60ed05244316f4dd713633fa675d47f374b4b613 | |
| parent | 0b6ebaab007ece723116e6726d957e0092dd4b1c (diff) | |
| download | krb5-6a8573e3afe7706da637326f671f127336ebdaed.tar.gz krb5-6a8573e3afe7706da637326f671f127336ebdaed.tar.xz krb5-6a8573e3afe7706da637326f671f127336ebdaed.zip | |
Drop obsolete patch
| -rw-r--r-- | krb5-master-gss_oid_leak.patch | 28 | ||||
| -rw-r--r-- | krb5.spec | 3 |
2 files changed, 1 insertions, 30 deletions
diff --git a/krb5-master-gss_oid_leak.patch b/krb5-master-gss_oid_leak.patch deleted file mode 100644 index 9613823..0000000 --- a/krb5-master-gss_oid_leak.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 1cda48a7ed4069cfc052f974ec3d76a9137c8c5a -Author: Simo Sorce <simo@redhat.com> -Date: Fri Dec 13 12:00:41 2013 -0500 - - Fix memory leak in SPNEGO initiator - - If we eliminate a mechanism from the initiator list because - gss_init_sec_context fails, free the memory for that mech OID before - removing it from the list. - - [ghudson@mit.edu: clarified commit message] - - ticket: 7803 (new) - target_version: 1.12.1 - tags: pullup - -diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c -index 818a1b4..06cfab0 100644 ---- a/src/lib/gssapi/spnego/spnego_mech.c -+++ b/src/lib/gssapi/spnego/spnego_mech.c -@@ -890,6 +890,7 @@ init_ctx_call_init(OM_uint32 *minor_status, - * can do this with recursion. If all mechanisms produce errors, the - * caller should get the error from the first mech in the list. - */ -+ gssalloc_free(sc->mech_set->elements->elements); - memmove(sc->mech_set->elements, sc->mech_set->elements + 1, - --sc->mech_set->count * sizeof(*sc->mech_set->elements)); - if (sc->mech_set->count == 0) @@ -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 -Patch137: krb5-master-gss_oid_leak.patch Patch138: krb5-master-keytab_close.patch Patch139: krb5-1.12-copy_context.patch Patch140: krb5-master-spnego_error_messages.patch @@ -314,7 +313,6 @@ ln -s NOTICE LICENSE %patch71 -p1 -b .dirsrv-accountlock %{?_rawbuild} %patch86 -p0 -b .debuginfo %patch105 -p1 -b .kvno -%patch137 -p1 -b .gss_oid_leak %patch138 -p1 -b .keytab_close %patch139 -p1 -b .copy_context %patch140 -p1 -b .spnego_error_messages @@ -978,6 +976,7 @@ exit 0 - update to 1.12.1 - drop patch for RT#7794, included now - drop patch for RT#7797, included now + - drop patch for RT#7803, 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 |