Exit successfully on -help

Running a command with -help is not an error. cmd_Dispatch handles
this correctly, but several server processes call cmd_Parse directly,
and exit with failure on -help. Make them exit successfully instead.

Change-Id: Ieab32ba4a62a182308538469e69320d241dc3aad
Reviewed-on: http://gerrit.openafs.org/10421
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index d7b65169dcf38741e89bd4379002d481291c37f4..8df4e3a045cd988ba27f231b371738cb2333475d 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -351,6 +351,9 @@ main(int argc, char **argv)
                        "permit Kerberos 5 principals with dots");
 
     code = cmd_Parse(argc, argv, &opts);
+    if (code == CMD_HELP) {
+       PT_EXIT(0);
+    }
     if (code)
        PT_EXIT(1);
 

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 2ed8324cda65707f27ad9e81924375f50bec2993..e47bcbcb3383187357c154c3a58228ce71d6eb77 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -1165,6 +1165,9 @@ ParseArgs(int argc, char *argv[])
            CMD_OPTIONAL, "configuration location");
 
     code = cmd_Parse(argc, argv, &opts);
+    if (code == CMD_HELP) {
+       exit(0);
+    }
     if (code)
        return -1;
 

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 2569e7a3ec89ae2c689621f70bcc0d3565dc392f..02aeecc23d5be2813771d98ae323890322a66718 100644 (file)
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -264,6 +264,9 @@ main(int argc, char **argv)
                        "permit Kerberos 5 principals with dots");
 
     code = cmd_Parse(argc, argv, &opts);
+    if (code == CMD_HELP) {
+       exit(0);
+    }
     if (code)
        return -1;
 

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index 0a42b36c55953f9de7b0d8838af3ce9bdb219be2..367a8a8003daa2a4575bb70051d578ddbee29c80 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -330,7 +330,9 @@ ParseArgs(int argc, char **argv) {
           CMD_OPTIONAL, "configuration location");
 
     code = cmd_Parse(argc, argv, &opts);
-
+    if (code == CMD_HELP) {
+       exit(0);
+    }
     if (code)
        return 1;