pt-tls-client: Introduced --options as a synonym for --optionsfrom

diff --git a/src/pt-tls-client/pt-tls-client.1.in b/src/pt-tls-client/pt-tls-client.1.in
index d7c9dffe5c72abc4ec42b408b7f391922907e1c4..795054c807fac618a99291888743dda129993980 100644 (file)
--- a/src/pt-tls-client/pt-tls-client.1.in
+++ b/src/pt-tls-client/pt-tls-client.1.in
@@ -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"

diff --git a/src/pt-tls-client/pt-tls-client.c b/src/pt-tls-client/pt-tls-client.c
index d7e78c497c3cdbe3df65e0a4d27bfea5a61c8488..841724eb3d50379f3c33d211ad37a0335d999e0f 100644 (file)
--- a/src/pt-tls-client/pt-tls-client.c
+++ b/src/pt-tls-client/pt-tls-client.c
@@ -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 }
                };