From 3e0eaec61e1df9341ca67b902a5ec86a863a3423 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementix.org>
Date: Mon, 11 Jun 2012 16:37:53 -0400
Subject: [PATCH] viced: fix GetVolumePackage to not bomb always when GetClient
 called

master only. already correct in 1.6. the gotos for error exit should
be called only when we have an error, due to missing braces that was
not true

Change-Id: I396be7d34ad741e01634a702784a0892f47a2d5a
Reviewed-on: http://gerrit.openafs.org/7549
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: BuildBot <buildbot@rampaginggeek.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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index a3070f6106..2bcab1b982 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -847,9 +847,10 @@ GetVolumePackageWithCall(struct rx_call *acall, struct VCallByVol *cbv,
 	if (!(*client)) {
 	    if ((errorCode = GetClient(tcon, client)) != 0)
 		goto gvpdone;
-	    if (!(*client))
+	    if (!(*client)) {
 		errorCode = EINVAL;
 		goto gvpdone;
+	    }
 	}
 	GetRights(*client, aCL, rights, anyrights);
 	/* ok, if this is not a dir, set the PRSFS_ADMINISTER bit iff we're the owner */