DAFS: Do not ignore out-of-range -vhashsize

If the specified -vhashsize is out of the 6-14 range, do not just
ignore it. Instead, note the error and quit.

Reviewed-on: http://gerrit.openafs.org/2649
Tested-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 575bdaf56e8f5503513bec113653fbbe525ae228)

Change-Id: Ie0ebfcf1b5c88816ef58eab109fb05de4c7fad1e
Reviewed-on: http://gerrit.openafs.org/5749
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 63a652374efc473b188c7e14beae93f23ea4fbb2..d717b2da5e6bc6884bc34dd3a9a9a424566a906f 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -1196,11 +1196,17 @@ ParseArgs(int argc, char *argv[])
                return -1;
            }
        } else if (!strcmp(argv[i], "-vhashsize")) {
+           int hashsize;
             if ((i + 1) >= argc) {
                fprintf(stderr, "missing argument for %s\n", argv[i]);
                return -1;
            }
-           VSetVolHashSize(atoi(argv[++i]));
+           hashsize = atoi(argv[++i]);
+           if (VSetVolHashSize(hashsize)) {
+               fprintf(stderr, "specified -vhashsize (%s) is invalid or out "
+                               "of range\n", argv[i]);
+               return -1;
+           }
        } else if (!strcmp(argv[i], "-vlrudisable")) {
            VLRU_SetOptions(VLRU_SET_ENABLED, 0);
        } else if (!strcmp(argv[i], "-vlruthresh")) {