[krb5/f15/master] - backport change from SVN to fix a computed-value-not-used warning in kpropd (#684065)

Nalin Dahyabhai nalin at fedoraproject.org
Fri Mar 18 17:33:15 UTC 2011


commit fefb84d05e8ae71b4c12ae5b52dd008b63764fac
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Fri Mar 18 13:23:12 2011 -0400

    - backport change from SVN to fix a computed-value-not-used warning in
      kpropd (#684065)

 krb5-1.9-paren.patch |   13 +++++++++++++
 krb5.spec            |    6 ++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/krb5-1.9-paren.patch b/krb5-1.9-paren.patch
new file mode 100644
index 0000000..1332f77
--- /dev/null
+++ b/krb5-1.9-paren.patch
@@ -0,0 +1,13 @@
+Upstream commit #24477.
+diff -up krb5-1.9/src/slave/kpropd.c krb5-1.9/src/slave/kpropd.c
+--- krb5-1.9/src/slave/kpropd.c	2011-03-18 13:14:24.020999947 -0400
++++ krb5-1.9/src/slave/kpropd.c	2011-03-18 13:14:34.159999947 -0400
+@@ -993,7 +993,7 @@ unsigned int backoff_from_master(int *cn
+     btime = (unsigned int)(2<<(*cnt));
+     if (btime > MAX_BACKOFF) {
+         btime = MAX_BACKOFF;
+-        *cnt--;
++        (*cnt)--;
+     }
+ 
+     return (btime);
diff --git a/krb5.spec b/krb5.spec
index 1275285..d423284 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -52,6 +52,7 @@ Patch72: krb5-pkinit-cms2.patch
 Patch73: http://web.mit.edu/kerberos/advisories/2011-001-patch.txt
 Patch74: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
 Patch75: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
+Patch76: krb5-1.9-paren.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -192,6 +193,7 @@ ln -s NOTICE LICENSE
 %patch73 -p1 -b .2011-001
 %patch74 -p1 -b .2011-002
 %patch75 -p1 -b .2011-003
+%patch76 -p1 -b .paren
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -650,6 +652,10 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Fri Mar 18 2011 Nalin Dahyabhai <nalin at redhat.com>
+- backport change from SVN to fix a computed-value-not-used warning in
+  kpropd (#684065)
+
 * Tue Mar 15 2011 Nalin Dahyabhai <nalin at redhat.com> 1.9-6
 - add revised upstream patch to fix double-free in KDC while returning
   typed-data with errors (CVE-2011-0284, #674325)


More information about the scm-commits mailing list