vos: convertROtoRW misc error reporting problems

[openafs.git] / src / volser / vos.c

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 4d145ab..0010a1b 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -5450,13 +5450,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");
@@ -5538,7 +5538,7 @@ ConvertRO(struct cmd_syndesc *as, void *arock)
            PrintError("", code);
        else
            fprintf(STDERR, "Unknown volume ID or name '%s'\n",
-                   as->parms[0].items->data);
+                   as->parms[2].items->data);
        return -1;
     }
     if (as->parms[3].items)
@@ -5549,7 +5549,7 @@ ConvertRO(struct cmd_syndesc *as, void *arock)
        fprintf(STDERR,
                "Could not fetch the entry for volume %lu from VLDB\n",
                (unsigned long)volid);
-       PrintError("convertROtoRW", code);
+       PrintError("convertROtoRW ", vcode);
        return vcode;
     }
 
@@ -5831,8 +5831,10 @@ MyBeforeProc(struct cmd_syndesc *as, void *arock)
     if (as->parms[13].items)
        secFlags |= AFSCONF_SECOPTS_NOAUTH;
 
-    if (as->parms[14].items)   /* -serverauth specified */
+    if (as->parms[14].items) { /* -localauth specified */
        secFlags |= AFSCONF_SECOPTS_LOCALAUTH;
+       confdir = AFSDIR_SERVER_ETC_DIRPATH;
+    }
 
     if (as->parms[16].items     /* -encrypt specified */
 #ifdef AFS_NT40_ENV