From: Derrick Brashear <shadow@dementix.org>
Date: Mon, 11 Jun 2012 20:05:10 +0000 (-0400)
Subject: viced: fix merge error
X-Git-Tag: upstream/1.8.0_pre1^2~2340
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3770ffe41689bc5b37795f23b0d4f3de4bc0619a;p=packages%2Fo%2Fopenafs.git

viced: fix merge error

when 37fc2dfbb9e3a8a8ecb022febae7ccd04d7340a4 was merged, the close
bracket went in the wrong place, meaning for non-remote calls
we don't re-enable keepalives. fix it.

Change-Id: I163db9b3b2f42f629d8a5ff22a75902a61a3138b
Reviewed-on: http://gerrit.openafs.org/7548
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 221ecf82a..a3070f610 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -865,10 +865,10 @@ GetVolumePackageWithCall(struct rx_call *acall, struct VCallByVol *cbv,
 	if (!VanillaUser(*client))
 	    (*rights) |= PRSFS_LOOKUP;
 #endif /* ADMIN_IMPLICIT_LOOKUP */
+    }
 gvpdone:
     if (errorCode)
 	rx_KeepAliveOn(acall);
-    }
     return errorCode;
 
 }				/*GetVolumePackage */