summaryrefslogtreecommitdiffstats
path: root/doc/man1/s_client.pod
diff options
context:
space:
mode:
authorPaul Yang <yang.yang@baishancloud.com>2017-10-16 15:32:24 -0400
committerRich Salz <rsalz@openssl.org>2017-10-16 15:32:24 -0400
commit8176431d5901ed09c8cd99c85178f43172741ddc (patch)
treef6414b861fd12a28813b43e0f7147c3d192f6586 /doc/man1/s_client.pod
parentcc1c473d70b5cc73bff8546e949d8609ad740099 (diff)
Make '-name' option of the 's_client' more generic
And also make '-xmpphost' an alias of the '-name' option. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4524)
Diffstat (limited to 'doc/man1/s_client.pod')
-rw-r--r--doc/man1/s_client.pod20
1 files changed, 19 insertions, 1 deletions
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index 50f6b9cfd8..c48ff8c3e2 100644
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -100,6 +100,7 @@ B<openssl> B<s_client>
[B<-serverpref>]
[B<-starttls protocol>]
[B<-xmpphost hostname>]
+[B<-name hostname>]
[B<-engine id>]
[B<-tlsextdebug>]
[B<-no_ticket>]
@@ -514,6 +515,22 @@ specifies the host for the "to" attribute of the stream element.
If this option is not specified, then the host specified with "-connect"
will be used.
+This option is an alias of the B<-name> option for "xmpp" and "xmpp-server".
+
+=item B<-name hostname>
+
+This option is used to specify hostname information for various protocols
+used with B<-starttls> option. Currently only "xmpp", "xmpp-server",
+"smtp" and "lmtp" can utilize this B<-name> option.
+
+If this option is used with "-starttls xmpp" or "-starttls xmpp-server",
+if specifies the host for the "to" attribute of the stream element. If this
+option is not specified, then the host specified with "-connect" will be used.
+
+If this option is used with "-starttls lmtp" or "-starttls smtp", it specifies
+the name to use in the "LMTP LHLO" or "SMTP EHLO" message, respectively. If
+this option is not specified, then "mail.example.com" will be used.
+
=item B<-tlsextdebug>
Print out a hex dump of any TLS extensions received from the server.
@@ -680,7 +697,8 @@ L<SSL_CTX_set_max_pipelines(3)>
=head1 HISTORY
-The -no_alt_chains options was first added to OpenSSL 1.1.0.
+The B<-no_alt_chains> option was first added to OpenSSL 1.1.0.
+The B<-name> option was added in OpenSSL 1.1.1.
=head1 COPYRIGHT