From d74366a6f2a05e8611e4b24b6a71b681b036a71d Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Tue, 15 Nov 2016 17:23:32 +0900
Subject: [PATCH] config: change order of parameters

Put same layer configuration parameters together, bring low layer
parameters earlier.
---
 xrdp/xrdp.ini | 75 ++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index 9541257d..f0bb5c00 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini
@@ -2,42 +2,56 @@
 ; xrdp.ini file version number
 ini_version=1
 
-bitmap_cache=true
-bitmap_compression=true
-port=3389
-allow_channels=true
-max_bpp=32
+; fork a new process for each incoming connection
 fork=true
-; minimum security level allowed for client
-; can be 'none', 'low', 'medium', 'high', 'fips'
-crypt_level=high
+; tcp port to listen
+port=3389
+; regulate if the listening socket use socket option tcp_nodelay
+; no buffering will be performed in the TCP stack
+tcp_nodelay=true
+; regulate if the listening socket use socket option keepalive
+; if the network connection disappear without close messages the connection will be closed
+tcp_keepalive=true
+#tcp_send_buffer_bytes=32768
+#tcp_recv_buffer_bytes=32768
+
 ; security layer can be 'tls', 'rdp' or 'negotiate'
 ; for client compatible layer
 security_layer=negotiate
+; minimum security level allowed for client
+; can be 'none', 'low', 'medium', 'high', 'fips'
+crypt_level=high
 ; X.509 certificate and private key
 ; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365
 certificate=
 key_file=
-; disable SSlv3
+; regulate xrdp if to accept SSLv3 connections
 #disableSSLv3=true
 ; set TLS cipher suites
 #tls_ciphers=HIGH
 
-; regulate if the listening socket use socket option tcp_nodelay
-; no buffering will be performed in the TCP stack
-tcp_nodelay=true
-
-; regulate if the listening socket use socket option keepalive
-; if the network connection disappear without close messages the connection will be closed
-tcp_keepalive=true
+; Section name to use for automatic login if the client sends username
+; and password
+autorun=X11rdp
 
-#tcp_send_buffer_bytes=32768
-#tcp_recv_buffer_bytes=32768
+allow_channels=true
+allow_multimon=true
+bitmap_cache=true
+bitmap_compression=true
+bulk_compression=true
+#hidelogwindow=true
+max_bpp=32
+new_cursors=true
+; fastpath - can be 'input', 'output', 'both', 'none'
+use_fastpath=both
+; when true, userid/password *must* be passed on cmd line
+#require_credentials=true
+; You can set the PAM error text in a gateway setup (MAX 256 chars)
+#pamerrortxt=change your password according to policy at http://url
 
 ;
 ; colors used by windows in RGB format
 ;
-
 blue=009cb5
 grey=dedede
 #black=000000
@@ -49,24 +63,6 @@ grey=dedede
 #green=00ff00
 #background=626c72
 
-#hidelogwindow=true
-
-; when true, userid/password *must* be passed on cmd line
-# require_credentials=true
-
-; Section name to use for automatic login if the client sends username
-; and password
-autorun=X11rdp
-
-bulk_compression=true
-
-; You can set the PAM error text in a gateway setup (MAX 256 chars)
-#pamerrortxt=change your password according to policy at http://url
-new_cursors=true
-allow_multimon=true
-
-; fastpath - can be set to input / output / both / none
-use_fastpath=both
 ;
 ; configure login screen
 ;
@@ -144,6 +140,11 @@ tcutils=true
 ; for debugging xrdp, add following line to section xrdp1
 #chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210
 
+
+;
+; Session types
+;
+
 [X11rdp]
 name=X11rdp
 lib=libxup.so