viced: fix merge error
authorDerrick Brashear <shadow@dementix.org>
Mon, 11 Jun 2012 20:05:10 +0000 (16:05 -0400)
committerDerrick Brashear <shadow@dementix.org>
Mon, 11 Jun 2012 22:27:23 +0000 (15:27 -0700)
commit3770ffe41689bc5b37795f23b0d4f3de4bc0619a
tree54b6cfc7586cad78bfe835f98d4c9790a0715e7c
parent4f9c3f2be9abd5548dd52888b49c407d574b6557
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>
src/viced/afsfileprocs.c