From: Wil Cooley <wcooley@users.sourceforge.net>
Date: Tue, 2 Mar 2010 20:54:15 +0000 (+0100)
Subject: pkitool lacks expected option "--help"
X-Git-Tag: v2.2-beta1~6^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f4725e86be9700c5894e360e09496d9ee1cfb85;p=thirdparty%2Fopenvpn.git

pkitool lacks expected option "--help"

The pkitool script lacks the "--help" parameter to actually display the
usage statement; most people are conditioned to try that before running the
command without options. This patch adds that and "--version" to display
just the program name and version.

sf.net tracker:
<https://sourceforge.net/tracker/?func=detail&atid=454721&aid=1705407&group_id=48978>

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Acked-by: Jan Just Keijser <janjust@nikhef.nl>
---

diff --git a/easy-rsa/2.0/pkitool b/easy-rsa/2.0/pkitool
index 1dffcdd4a..2a0b2f382 100755
--- a/easy-rsa/2.0/pkitool
+++ b/easy-rsa/2.0/pkitool
@@ -192,6 +192,12 @@ while [ $# -gt 0 ]; do
 		     $PKCS11TOOL --module "$PKCS11_MODULE_PATH" --list-objects --login --slot "$PKCS11_SLOT"
 		     exit 0;;
 
+        --help|--usage)
+                    usage
+                    exit ;;
+        --version)
+                    echo "$PROGNAME $VERSION"
+                    exit ;;
 	# errors
 	--*        ) die "$PROGNAME: unknown option: $1" ;;
 	*          ) break ;;