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

[Nalin Dahyabhai]

commit e1297e3d0afde00802b255d51e232a2d1370d0e7
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Fri Mar 18 13:22:50 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 dbd9130..fdb817b 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -60,6 +60,7 @@ Patch81: krb5-1.8.2-1.8.3-crypto.patch
 Patch82: http://web.mit.edu/kerberos/advisories/2011-001-patch.txt
 Patch83: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
 Patch84: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
+Patch85: krb5-1.9-paren.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -210,6 +211,7 @@ ln -s NOTICE LICENSE
 %patch82 -p1 -b .2011-001
 %patch83 -p1 -b .2011-002
 %patch84 -p1 -b .2011-003
+%patch85 -p1 -b .paren
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -661,6 +663,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.8.2-9
 - add revised upstream patch to fix double-free in KDC while returning
   typed-data with errors (CVE-2011-0284, #674325)