From 165d28174d81aec697859203f709744e908d2abf Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 9 Sep 2017 10:31:02 +0200
Subject: [PATCH] pt-tls-client: Introduced --options as a synonym for
 --optionsfrom

---
 src/pt-tls-client/pt-tls-client.1.in | 4 ++--
 src/pt-tls-client/pt-tls-client.c    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pt-tls-client/pt-tls-client.1.in b/src/pt-tls-client/pt-tls-client.1.in
index d7c9dffe5c..795054c807 100644
--- 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 d7e78c497c..841724eb3d 100644
--- 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 }
 		};