summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@dahyabhai.net>2013-10-15 16:40:29 -0400
committerNalin Dahyabhai <nalin@dahyabhai.net>2013-11-19 17:32:19 -0500
commit11656c4fe0a26030d58a547f36e5791cc21e01aa (patch)
treef243827e3bc75ebfea0ce05760625b13a6faa781
parent9c8c2d53baca59f28406d12cbe7da22ca2aaf79b (diff)
downloadkrb5-11656c4fe0a26030d58a547f36e5791cc21e01aa.tar.gz
krb5-11656c4fe0a26030d58a547f36e5791cc21e01aa.tar.xz
krb5-11656c4fe0a26030d58a547f36e5791cc21e01aa.zip
Drop obsolete patch fixing a test use-before-init
-rw-r--r--krb5-1.11-alpha1-init.patch12
-rw-r--r--krb5.spec3
2 files changed, 1 insertions, 14 deletions
diff --git a/krb5-1.11-alpha1-init.patch b/krb5-1.11-alpha1-init.patch
deleted file mode 100644
index 67875e6..0000000
--- a/krb5-1.11-alpha1-init.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-If krb5_init_context() fails, context is going to be NULL anyway.
---- krb5/src/lib/krb5/krb/t_cc_config.c
-+++ krb5/src/lib/krb5/krb/t_cc_config.c
-@@ -117,7 +117,7 @@ main(int argc, char **argv)
- int c;
- unsigned int i;
-
-- bail_on_err(context, "Error initializing Kerberos library",
-+ bail_on_err(NULL, "Error initializing Kerberos library",
- krb5_init_context(&context));
- bail_on_err(context, "Error getting location of default ccache",
- krb5_cc_default(context, &ccache));
diff --git a/krb5.spec b/krb5.spec
index bbbb1a4..1f00d6a 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -88,7 +88,6 @@ Patch63: krb5-1.12-selinux-label.patch
Patch71: krb5-1.11-dirsrv-accountlock.patch
Patch86: krb5-1.9-debuginfo.patch
Patch105: krb5-kvno-230379.patch
-Patch113: krb5-1.11-alpha1-init.patch
Patch116: http://ausil.fedorapeople.org/aarch64/krb5/krb5-aarch64.patch
Patch117: krb5-1.11-gss-client-keytab.patch
Patch121: krb5-cccol-primary.patch
@@ -322,7 +321,6 @@ ln -s NOTICE LICENSE
%patch71 -p1 -b .dirsrv-accountlock %{?_rawbuild}
%patch86 -p0 -b .debuginfo
%patch105 -p1 -b .kvno
-%patch113 -p1 -b .init
%patch116 -p1 -b .aarch64
%patch117 -p1 -b .gss-client-keytab
%patch121 -p1 -b .cccol-primary
@@ -1034,6 +1032,7 @@ exit 0
- initial update to alpha1
- drop backport of persistent keyring support
- drop backport for RT#7689
+ - drop obsolete patch for fixing a use-before-init in a test program
* Wed Oct 16 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-26
- create and own /etc/gss (#1019937)