From 4f7f51121b1510761a478e89fe6cff3303ff6439 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Fri, 15 Aug 2014 15:04:26 -0400
Subject: [PATCH] drop patch for CVE-2014-4345, included in 1.12.2

---
 2014-001-patch.txt     |  14 --------------
 2014-001-patch.txt.asc | Bin 419 -> 0 bytes
 krb5.spec              |   4 +---
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 2014-001-patch.txt
 delete mode 100644 2014-001-patch.txt.asc

diff --git a/2014-001-patch.txt b/2014-001-patch.txt
deleted file mode 100644
index 19ea866..0000000
--- a/2014-001-patch.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index ce851ea..df5934c 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -456,7 +456,8 @@ krb5_encode_krbsecretkey(krb5_key_data *key_data_in, int n_key_data,
-             j++;
-             last = i + 1;
-
--            currkvno = key_data[i].key_data_kvno;
-+            if (i < n_key_data - 1)
-+                currkvno = key_data[i + 1].key_data_kvno;
-         }
-     }
-     ret[num_versions] = NULL;
diff --git a/2014-001-patch.txt.asc b/2014-001-patch.txt.asc
deleted file mode 100644
index adefc753a4b115ae6c75706f2ffdecc6c350a96f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmV;U0bKrx0iXl`0SEvF1p-s!`11e?2@ojRrt@U$brSA=3?R0vhx_?>`ZBu{6%Wcq
zDK|Z@;<g&h2T*QPd*Ke9IfH4pOOjtIX_cGDY5In~%QCp`0m_LdDla8Ku}ET)jP$`t
z@V|-lj&Ig&C6qy?i*qAIg+98kXL(}&!I-8Y%KyuT-W|Fa1iA;2%Lfe_M#<-pUgx|6
zkrD$7T;T54QUYih9zf?%Vqt!-q=zq&kGsKItADnb1>)sDW)lUVj*+4bhN<iRCY`ob
zc_>riMO-R;$MusUpjlUFMjd1zRSy7n{~d$emXs~CTZ6%3#O+?xKk?q`!znhuI3NPQ
zFyDz=U8sFfMWOY!IR#BRF5cC@_aNt-&I5&1x~r&;MWjR2sV~OgMZ|#@!+K+T32H@U
z&;f(38;n<8W&P8%KQ(1<s~&k$1dI_-XPPcL5j`U@+6P=Z9<eX})jBn26##CM(*@<v
zY<+~@^G*z<{0vwngW^HUG1ETGmN#8F7C?n(Q}CdiEfRbXqs2aTUBAjtisXsI{J;I9
Nw)J{<%?qP=Xf_}2#P<LI

diff --git a/krb5.spec b/krb5.spec
index 0e7c740..0197432 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -98,8 +98,6 @@ Patch139: krb5-master-rcache-acquirecred-source.patch
 Patch141: krb5-master-rcache-acquirecred-test.patch
 Patch142: krb5-master-move-otp-sockets.patch
 Patch145: krb5-master-mechd.patch
-Patch150: http://web.mit.edu/kerberos/advisories/2014-001-patch.txt
-Patch151: http://web.mit.edu/kerberos/advisories/2014-001-patch.txt.asc
 Patch201: 0001-In-ksu-merge-krb5_ccache_copy-and-_restricted.patch
 Patch202: 0002-In-ksu-don-t-stat-not-on-disk-ccache-residuals.patch
 Patch203: 0003-Use-an-intermediate-memory-cache-in-ksu.patch
@@ -347,7 +345,6 @@ ln -s NOTICE LICENSE
 %patch141 -p1 -b .rcache-acquirecred-test
 %patch142 -p1 -b .move-otp-sockets
 %patch145 -p1 -b .master-mechd
-%patch150 -p1 -b .2014-001
 
 # Take the execute bit off of documentation.
 chmod -x doc/krb5-protocol/*.txt doc/ccapi/*.html
@@ -1036,6 +1033,7 @@ exit 0
   - drop patches for CVE-2014-4341/CVE-2014-4342, included in 1.12.2
   - drop patch for CVE-2014-4343, included in 1.12.2
   - drop patch for CVE-2014-4344, included in 1.12.2
+  - drop patch for CVE-2014-4345, included in 1.12.2
 - replace older proposed changes for ksu with backports of the changes
   after review and merging upstream (#1015559, #1026099, #1118347)