summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2016-12-14 14:50:08 +0900
committermetalefty <meta@vmeta.jp>2017-02-27 14:17:25 +0900
commiteefc099df74ee4bc872a3c8254a27a38e353f7ae (patch)
tree129e4fb3b9945c102c7565520b11421676532f64
parentc64e9992e6f3327e7167416fe55e0b56d6f99a58 (diff)
downloadxrdp-proprietary-eefc099df74ee4bc872a3c8254a27a38e353f7ae.tar.gz
xrdp-proprietary-eefc099df74ee4bc872a3c8254a27a38e353f7ae.zip
docs: document ssl_protocols, remove document for disableSSLv3
-rw-r--r--docs/man/xrdp.ini.5.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/man/xrdp.ini.5.in b/docs/man/xrdp.ini.5.in
index 5a06c7f4..979c629b 100644
--- a/docs/man/xrdp.ini.5.in
+++ b/docs/man/xrdp.ini.5.in
@@ -96,12 +96,6 @@ Processing Standard 140-1 validated encryption methods.
.RE
.TP
-\fBdisableSSLv3\fP=\fI[true|false]\fP
-If set to \fB1\fP, \fBtrue\fP or \fByes\fP, \fBxrdp\fP will not accept SSLv3 connections.
-If not specified, defaults to \fBfalse\fP.
-This parameter is effective only if \fBsecurity_layer\fP is set to \fBtls\fP or \fBnegotiate\fP.
-
-.TP
\fBfork\fP=\fI[true|false]\fP
If set to \fB1\fR, \fBtrue\fR or \fByes\fR for each incoming connection \fBxrdp\fR(8) forks a sub-process instead of using threads.
@@ -150,6 +144,12 @@ Negotiate these security methods with clients.
.RE
.TP
+\fBssl_protocols\fP=\fI[SSLv3] [TLSv1] [TLSv1.1] [TLSv1.2]\fP
+Enables the specified SSL/TLS protocols. Each value should be separated by space.
+SSLv2 is always disabled. At least one protocol should be given to accept TLS connections.
+This parameter is effective only if \fBsecurity_layer\fP is set to \fBtls\fP or \fBnegotiate\fP.
+
+.TP
\fBtcp_keepalive\fP=\fI[true|false]\fP
Regulate if the listening socket uses socket option \fBSO_KEEPALIVE\fP.
If set to \fB1\fP, \fBtrue\fP or \fByes\fP and the network connection disappears