diff options
| author | David Sommerseth | 2010-07-22 22:33:16 +0200 |
|---|---|---|
| committer | David Sommerseth | 2010-07-22 22:33:16 +0200 |
| commit | 0b026a985d6232d459ed4e2b6642853c959667da (patch) | |
| tree | a43bbe677b158de41f32bb240358ec4c1d2f34b2 /easy-rsa | |
| parent | c70135d8ed31d133f2fb085bee01db8ad26d7fec (diff) | |
| parent | 031d18fcb8a2a552aecabb41f1afdfe3f51bdd58 (diff) | |
| download | openvpn-0b026a985d6232d459ed4e2b6642853c959667da.zip openvpn-0b026a985d6232d459ed4e2b6642853c959667da.tar.gz | |
Merge branch 'feat_misc' into beta2.2
Conflicts:
Makefile.am
- Copyright update
- Added configure.h to CLEANFILES
options.c
- Copyright update
- More verbose information about enabled features
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'easy-rsa')
| -rwxr-xr-x | easy-rsa/2.0/pkitool | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/easy-rsa/2.0/pkitool b/easy-rsa/2.0/pkitool index 7266988..49588f5 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 ;; |