pt-tls-client: Introduced --options as a synonym for --optionsfrom
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 9 Sep 2017 08:31:02 +0000 (10:31 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 9 Sep 2017 08:31:02 +0000 (10:31 +0200)
src/pt-tls-client/pt-tls-client.1.in
src/pt-tls-client/pt-tls-client.c

index d7c9dff..795054c 100644 (file)
@@ -20,7 +20,7 @@ pt-tls-client \- Simple client using PT-TLS to collect integrity information
 .OP \-\-client client-id
 .OP \-\-secret password
 .OP \-\-mutual
-.OP \-\-optionsfrom filename
+.OP \-\-options filename
 .OP \-\-quiet
 .OP \-\-debug level
 .YS
@@ -92,7 +92,7 @@ Set debug level, default: 1.
 .B "\-q, \-\-quiet
 Disable debug output to stderr.
 .TP
-.BI "\-+, \-\-optionsfrom " file
+.BI "\-+, \-\-options " file
 Read command line options from \fIfile\fR.
 .
 .SH "EXAMPLES"
index d7e78c4..841724e 100644 (file)
@@ -45,7 +45,7 @@ static void usage(FILE *out)
                "              [--cert <file>]+ [--keyid <hex>|--key <file>]\n"
                "              [--key-type rsa|ecdsa] [--client <client-id>]\n"
                "              [--secret <password>] [--mutual] [--quiet]\n"
-               "              [--debug <level>] [--optionsfrom <filename>]\n");
+               "              [--debug <level>] [--options <filename>]\n");
 }
 
 /**
@@ -289,6 +289,7 @@ int main(int argc, char *argv[])
                        {"mutual",              no_argument,                    NULL,           'm' },
                        {"quiet",               no_argument,                    NULL,           'q' },
                        {"debug",               required_argument,              NULL,           'd' },
+                       {"options",             required_argument,              NULL,           '+' },
                        {"optionsfrom", required_argument,              NULL,           '+' },
                        {0,0,0,0 }
                };