Update s_client and s_server documentation about some missing arguments

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1837)

diff --git a/apps/s_client.c b/apps/s_client.c
index a407303a07b22300a77dae34b3730de22372dbba..cfd7cbd79d93596f7e1216cab3e404e64bcb78ba 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -567,7 +567,7 @@ const OPTIONS s_client_options[] = {
     {"proxy", OPT_PROXY, 's',
      "Connect to via specified proxy to the real server"},
 #ifdef AF_UNIX
     {"proxy", OPT_PROXY, 's',
      "Connect to via specified proxy to the real server"},
 #ifdef AF_UNIX

-    {"unix", OPT_UNIX, 's', "Connect over unix domain sockets"},
+    {"unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket"},

 #endif
     {"4", OPT_4, '-', "Use IPv4 only"},
 #ifdef AF_INET6
 #endif
     {"4", OPT_4, '-', "Use IPv4 only"},
 #ifdef AF_INET6

diff --git a/apps/s_server.c b/apps/s_server.c
index 985841352dce5f035efb35bf10f60b4070c6cf49..ee6631809c16e827ce45c91cbff96ec2bf82e81f 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -684,7 +684,7 @@ const OPTIONS s_server_options[] = {
     {"port", OPT_PORT, 'p',
      "TCP/IP port to listen on for connections (default is " PORT ")"},
     {"accept", OPT_ACCEPT, 's',
     {"port", OPT_PORT, 'p',
      "TCP/IP port to listen on for connections (default is " PORT ")"},
     {"accept", OPT_ACCEPT, 's',

-     "TCP/IP optional host and port to accept on (default is " PORT ")"},
+     "TCP/IP optional host and port to listen on for connections (default is *:" PORT ")"},

 #ifdef AF_UNIX
     {"unix", OPT_UNIX, 's', "Unix domain socket to accept on"},
 #endif
 #ifdef AF_UNIX
     {"unix", OPT_UNIX, 's', "Unix domain socket to accept on"},
 #endif

diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index 4f21ea4093a5dfc4efad9f3afda4e83def00744a..03b5cdaf8ecf6887f68be3c9c6afcd5af6786515 100644 (file)
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -10,6 +10,9 @@ B<openssl> B<s_client>
 [B<-help>]
 [B<-connect host:port>]
 [B<-proxy host:port>]
 [B<-help>]
 [B<-connect host:port>]
 [B<-proxy host:port>]

+[B<-unix path>]
+[B<-4>]
+[B<-6>]

 [B<-servername name>]
 [B<-verify depth>]
 [B<-verify_return_error>]
 [B<-servername name>]
 [B<-verify depth>]
 [B<-verify_return_error>]


@@ -132,6 +135,18 @@ When used with the B<-connect> flag, the program uses the host and port
 specified with this flag and issues an HTTP CONNECT command to connect
 to the desired server.
 
 specified with this flag and issues an HTTP CONNECT command to connect
 to the desired server.
 

+=item B<-unix path>
+
+Connect over the specified Unix-domain socket.
+
+=item B<-4>
+
+Use IPv4 only.
+
+=item B<-6>
+
+Use IPv6 only.
+

 =item B<-servername name>
 
 Set the TLS SNI (Server Name Indication) extension in the ClientHello message.
 =item B<-servername name>
 
 Set the TLS SNI (Server Name Indication) extension in the ClientHello message.

diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod
index b6c56599725b948dcad47be691ec2e23c1ba9312..94065ba75308b79b225980a0968df56b27d584b7 100644 (file)
--- a/doc/man1/s_server.pod
+++ b/doc/man1/s_server.pod
@@ -8,8 +8,13 @@ s_server - SSL/TLS server program
 
 B<openssl> B<s_server>
 [B<-help>]
 
 B<openssl> B<s_server>
 [B<-help>]

-[B<-accept port>]
+[B<-port port>]
+[B<-accept val>]

 [B<-naccept count>]
 [B<-naccept count>]

+[B<-unix val>]
+[B<-unlink>]
+[B<-4>]
+[B<-6>]

 [B<-context id>]
 [B<-verify depth>]
 [B<-Verify depth>]
 [B<-context id>]
 [B<-verify depth>]
 [B<-Verify depth>]


@@ -125,14 +130,34 @@ manual page.
 
 Print out a usage message.
 
 
 Print out a usage message.
 

-=item B<-accept port>
+=item B<-port port>

 
 The TCP port to listen on for connections. If not specified 4433 is used.
 
 
 The TCP port to listen on for connections. If not specified 4433 is used.
 

+=item B<-accept val>
+
+The optional TCP host and port to listen on for connections. If not specified, *:4433 is used.
+

 =item B<-naccept count>
 
 The server will exit after receiving B<number> connections, default unlimited.
 
 =item B<-naccept count>
 
 The server will exit after receiving B<number> connections, default unlimited.
 

+=item B<-unix val>
+
+Unix domain socket to accept on.
+
+=item B<-unlink>
+
+For -unix, unlink existing socket first.
+
+=item B<-4>
+
+Use IPv4 only.
+
+=item B<-6>
+
+Use IPv6 only.
+

 =item B<-context id>
 
 Sets the SSL context id. It can be given any string value. If this option
 =item B<-context id>
 
 Sets the SSL context id. It can be given any string value. If this option