DAFS: Remove AFS_DEMAND_ATTACH_UTIL

[openafs.git] / src / vol / salvager.c

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index ef17092..1a5e92b 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -229,7 +229,7 @@ handleit(struct cmd_syndesc *as, void *arock)
     }
     if ((ti = as->parms[12].items))    /* -showlog */
        ShowLog = 1;
-    if ((ti = as->parms[13].items)) {  /* -log */
+    if ((ti = as->parms[13].items)) {  /* -showsuid */
        Testing = 1;
        ShowSuid = 1;
        Showmode = 1;
@@ -319,7 +319,7 @@ handleit(struct cmd_syndesc *as, void *arock)
      */
     if (seenvol) {
        char *msg = NULL;
-#if defined(AFS_DEMAND_ATTACH_FS) || defined(AFS_DEMAND_ATTACH_UTIL)
+#ifdef AFS_DEMAND_ATTACH_FS
        if (!AskDAFS()) {
            msg =
                "The DAFS dasalvager cannot be run with a non-DAFS fileserver.  Please use 'salvager'.";
@@ -509,7 +509,7 @@ main(int argc, char **argv)
 #ifdef FAST_RESTART
     cmd_AddParm(ts, "-DontSalvage", CMD_FLAG, CMD_OPTIONAL,
                "Don't salvage. This my be set in BosConfig to let the fileserver restart immediately after a crash. Bad volumes will be taken offline");
-#elif defined(AFS_DEMAND_ATTACH_FS) || defined(AFS_DEMAND_ATTACH_UTIL)
+#elif defined(AFS_DEMAND_ATTACH_FS)
     cmd_Seek(ts, 20); /* skip DontSalvage */
     cmd_AddParm(ts, "-forceDAFS", CMD_FLAG, CMD_OPTIONAL,
                "For Demand Attach Fileserver, permit a manual volume salvage outside of the salvageserver");