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

[Nalin Dahyabhai]

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

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

 krb5-1.7.1-paren.patch |   13 +++++++++++++
 krb5.spec              |    6 ++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/krb5-1.7.1-paren.patch b/krb5-1.7.1-paren.patch
new file mode 100644
index 0000000..f5b4608
--- /dev/null
+++ b/krb5-1.7.1-paren.patch
@@ -0,0 +1,13 @@
+Upstream commit #24477.
+diff -up krb5-1.7.1/src/slave/kpropd.cn krb5-1.7.1/src/slave/kpropd.c
+--- krb5-1.7.1/src/slave/kpropd.cn	2011-03-18 13:10:51.177999947 -0400
++++ krb5-1.7.1/src/slave/kpropd.c	2011-03-18 13:10:44.580999947 -0400
+@@ -980,7 +980,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 2b6aa5c..ddc83cf 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -95,6 +95,7 @@ Patch105: http://web.mit.edu/kerberos/advisories/2010-007-patch-r17.txt
 Patch106: http://web.mit.edu/kerberos/advisories/2011-001-patch.txt
 Patch107: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
 Patch108: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
+Patch109: krb5-1.7.1-paren.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -233,6 +234,10 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %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.7.1-18
 - add revised upstream patch to fix double-free in KDC while returning
   typed-data with errors (CVE-2011-0284, #674325)
@@ -1684,6 +1689,7 @@ popd
 %patch106 -p1 -b .2011-001
 %patch107 -p1 -b .2011-002
 %patch108 -p1 -b .2011-003
+%patch109 -p1 -b .paren
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex