summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2012-07-31 14:36:09 -0400
committerNalin Dahyabhai <nalin@redhat.com>2012-07-31 14:36:09 -0400
commit52418ea48fdfdaadf598cf927b7c7f89f3f8c230 (patch)
tree811b3f5e022d1705c7dce3f51099d61295ad8ceb
parent420f11337ff10e725c67ecfc5be4e4442b62c82c (diff)
parent899e16607682983b4edec5dfdcf1af5a818db59c (diff)
downloadkrb5-52418ea48fdfdaadf598cf927b7c7f89f3f8c230.tar.gz
krb5-52418ea48fdfdaadf598cf927b7c7f89f3f8c230.tar.xz
krb5-52418ea48fdfdaadf598cf927b7c7f89f3f8c230.zip
Merge remote-tracking branch 'origin/master' into f17krb5-1.10.2-5.fc17
-rw-r--r--krb5.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/krb5.spec b/krb5.spec
index b0b8544..9f0b169 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -771,7 +771,7 @@ exit 0
* Tue Jul 31 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.2-5
- add upstream patch to fix freeing an uninitialized pointer and dereferencing
another uninitialized pointer in the KDC (MITKRB5-SA-2012-001, CVE-2012-1014
- and CVE-2012-1015, #838012)
+ and CVE-2012-1015, #844779 and #844777)
- fix a thinko in whether or not we mess around with devel .so symlinks on
systems without a separate /usr (sbose)