From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 3 May 2012 17:40:40 +0000 (-0500)
Subject: vos setaddrs: notice unexpected errors
X-Git-Tag: upstream/1.6.2_pre2^2~179
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=596ed7d29dd24e51c45ffef19dc2d05a45c2f29b;p=packages%2Fo%2Fopenafs.git

vos setaddrs: notice unexpected errors

Currently 'vos setaddrs' only prints a message and errors out if the
VL_RegisterAddrs call fails with certain error codes (VL_MULTIPADDR
and RXGEN_OPCODE). But if we get something else like an access error,
we should of course print that out, instead of reporting success.

Reviewed-on: http://gerrit.openafs.org/7322
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Tom Keiser <tkeiser@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 663185d62df501fb9d7a18e6ef329e4f53aa8854)

Change-Id: I86b8729cd091007b84fb8b7bf19c58d477626686
Reviewed-on: http://gerrit.openafs.org/7489
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 90b9e55c1..0dd7ec941 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -5461,13 +5461,13 @@ SetAddrs(struct cmd_syndesc *as, void *arock)
     if (vcode) {
 	if (vcode == VL_MULTIPADDR) {
 	    fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed; The IP address exists on a different server; repair it\n");
-	    PrintError("", vcode);
-	    return vcode;
 	} else if (vcode == RXGEN_OPCODE) {
 	    fprintf(STDERR, "vlserver doesn't support VL_RegisterAddrs rpc; ignored\n");
-	    PrintError("", vcode);
-	    return vcode;
+	} else {
+	    fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed\n");
 	}
+	PrintError("", vcode);
+	return vcode;
     }
     if (verbose) {
 	fprintf(STDOUT, "vos: Changed UUID with addresses:\n");