vos: Default to server confdir for -localauth

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

diff --git a/src/volser/vos.c b/src/volser/vos.c
index d09ec8e..27be7d6 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -1474,7 +1474,9 @@ static void
 VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_uint32 server,
             afs_int32 part, int voltype)
 {
-    int totalOK, totalNotOK, totalBusy;
+    int totalOK = 0;
+    int totalNotOK = 0;
+    int totalBusy = 0;
 
     DisplayFormat(pntr, server, part, &totalOK, &totalNotOK, &totalBusy, 0, 1,
                  1);
@@ -5448,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");
@@ -5815,31 +5817,37 @@ MyBeforeProc(struct cmd_syndesc *as, void *arock)
 {
     char *tcell;
     afs_int32 code;
-    afs_int32 sauth;
+    int secFlags;
 
     /* Initialize the ubik_client connection */
     rx_SetRxDeadTime(90);
-    cstruct = (struct ubik_client *)0;
+    cstruct = NULL;
+    secFlags = AFSCONF_SECOPTS_FALLBACK_NULL;
 
-    sauth = 0;
     tcell = NULL;
     if (as->parms[12].items)   /* if -cell specified */
        tcell = as->parms[12].items->data;
-    if (as->parms[14].items)   /* -serverauth specified */
-       sauth = 1;
+
+    if (as->parms[13].items)
+       secFlags |= AFSCONF_SECOPTS_NOAUTH;
+
+    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
         || win32_enableCrypt()
 #endif /* AFS_NT40_ENV */
          )
-       vsu_SetCrypt(1);
+       secFlags |= AFSCONF_SECOPTS_ALWAYSENCRYPT;
 
     if (as->parms[18].items)   /* -config flag set */
        confdir = as->parms[18].items->data;
 
-    if ((code =
-        vsu_ClientInit((as->parms[13].items != 0), confdir, tcell, sauth,
-                       &cstruct, UV_SetSecurity))) {
+    if ((code = vsu_ClientInit(confdir, tcell, secFlags, UV_SetSecurity,
+                              &cstruct))) {
        fprintf(STDERR, "could not initialize VLDB library (code=%lu) \n",
                (unsigned long)code);
        exit(1);