From 4b07fcda219609905f537dc1fcfc5ff5557c154d Mon Sep 17 00:00:00 2001 From: Yoshimasa Niwa Date: Sun, 28 Oct 2018 18:06:48 -0700 Subject: [PATCH] Update documentation. Update man page, move help text at the same position. --- main.c | 6 +++--- openconnect.8.in | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 9a13106e..59c9f481 100644 --- a/main.c +++ b/main.c @@ -808,6 +808,9 @@ static void usage(void) printf(" --no-passwd %s\n", _("Disable password/SecurID authentication")); printf(" --non-inter %s\n", _("Do not expect user input; exit if it is required")); printf(" --passwd-on-stdin %s\n", _("Read password from standard input")); +#if ENABLE_KEYCHAIN + printf(" --use-keychain=NAME %s\n", _("Name of password form option that look up Keychain to fill")); +#endif printf(" --authgroup=GROUP %s\n", _("Choose authentication login selection")); printf(" -c, --certificate=CERT %s\n", _("Use SSL client certificate CERT")); printf(" -k, --sslkey=KEY %s\n", _("Use SSL private key file KEY")); @@ -823,9 +826,6 @@ static void usage(void) #ifndef HAVE_LIBPCSCLITE printf(" %s\n", _("(NOTE: Yubikey OATH disabled in this build)")); #endif -#if ENABLE_KEYCHAIN - printf(" --use-keychain=NAME %s\n", _("Name of password option to lookup Keychain")); -#endif printf("\n%s:\n", _("Server validation")); printf(" --servercert=FINGERPRINT %s\n", _("Server's certificate SHA1 fingerprint")); diff --git a/openconnect.8.in b/openconnect.8.in index 37a33d0c..2fe57c05 100644 --- a/openconnect.8.in +++ b/openconnect.8.in @@ -57,6 +57,7 @@ openconnect \- Multi-protocol VPN client, for Cisco AnyConnect VPNs and others .OP \-\-no\-xmlpost .OP \-\-non\-inter .OP \-\-passwd\-on\-stdin +.OP \-\-use-keychain string .OP \-\-protocol proto .OP \-\-token\-mode mode .OP \-\-token\-secret {secret\fR[\fI,counter\fR]|@\fIfile\fR} @@ -426,6 +427,11 @@ Do not expect user input; exit if it is required. .B \-\-passwd\-on\-stdin Read password from standard input .TP +.B \-\-use\-keychain=NAME +Look up Keychain to fill one of password form options. +.I NAME +is the name of the password form option. It may be "password". +.TP .B \-\-protocol=PROTO Select VPN protocol .I PROTO -- 2.49.0