From 076b9b746569ebdfbec2c8ae98a1d338c97a3d70 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 29 Oct 2013 21:11:54 -0500 Subject: [PATCH] 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 Reviewed-by: Derrick Brashear --- src/ptserver/ptserver.c | 3 +++ src/viced/viced.c | 3 +++ src/vlserver/vlserver.c | 3 +++ src/volser/volmain.c | 4 +++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index d7b65169d..8df4e3a04 100644 --- 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 2ed8324cd..e47bcbcb3 100644 --- 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 2569e7a3e..02aeecc23 100644 --- 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 0a42b36c5..367a8a800 100644 --- 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; -- 2.39.5