drop patch for CVE-2014-4345, included in 1.12.2
This commit is contained in:
parent
7880fca0ad
commit
4f7f51121b
@ -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;
|
||||
Binary file not shown.
@ -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)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user