Merge branch 'devel' of https://github.com/neutrinolabs/xrdp

Conflicts:
	xorgxrdp

1 files changed, 55 insertions, 56 deletions

diff --git a/sesman/sesman.ini b/sesman/sesman.ini
index a58af383..674665e9 100644
--- a/sesman/sesman.ini
+++ b/sesman/sesman.ini
@@ -1,59 +1,58 @@
 [Globals]
 ListenAddress=127.0.0.1
 ListenPort=3350
-EnableUserWindowManager=1
+EnableUserWindowManager=true
 UserWindowManager=startwm.sh
 DefaultWindowManager=startwm.sh
 
 [Security]
-AllowRootLogin=1
+AllowRootLogin=true
 MaxLoginRetry=4
 TerminalServerUsers=tsusers
 TerminalServerAdmins=tsadmins
-# When AlwaysGroupCheck = false access will be permitted
-# if the group TerminalServerUsers is not defined.
-AlwaysGroupCheck = false
+; When AlwaysGroupCheck=false access will be permitted
+; if the group TerminalServerUsers is not defined.
+AlwaysGroupCheck=false
 
 [Sessions]
-
-## X11DisplayOffset - x11 display number offset
-# Type: integer
-# Default: 10
+;; X11DisplayOffset - x11 display number offset
+; Type: integer
+; Default: 10
 X11DisplayOffset=10
 
-## MaxSessions - maximum number of connections to an xrdp server
-# Type: integer
-# Default: 0
+;; MaxSessions - maximum number of connections to an xrdp server
+; Type: integer
+; Default: 0
 MaxSessions=50
 
-## KillDisconnected - kill disconnected sessions
-# Type: integer
-# Default: 0
-# if 1, true, or yes, kill session after 60 seconds
-KillDisconnected=0
+;; KillDisconnected - kill disconnected sessions
+; Type: boolean
+; Default: false
+; if 1, true, or yes, kill session after 60 seconds
+KillDisconnected=false
 
-## IdleTimeLimit - when to disconnect idle sessions
-# Type: integer
-# Default: 0
-# if not zero, the seconds without mouse or keyboard input before disconnect
-# not complete yet
+;; IdleTimeLimit - when to disconnect idle sessions
+; Type: integer
+; Default: 0
+; if not zero, the seconds without mouse or keyboard input before disconnect
+; not complete yet
 IdleTimeLimit=0
 
-## DisconnectedTimeLimit - when to kill idle sessions
-# Type: integer
-# Default: 0
-# if not zero, the seconds before a disconnected session is killed
-# min 60 seconds
+;; DisconnectedTimeLimit - when to kill idle sessions
+; Type: integer
+; Default: 0
+; if not zero, the seconds before a disconnected session is killed
+; min 60 seconds
 DisconnectedTimeLimit=0
 
-## Policy - session allocation policy
-# Type: enum [ "Default" | "UBD" | "UBI" | "UBC" | "UBDI" | "UBDC" ]
-# Default: Xrdp:<User,BitPerPixel> and Xvnc:<User,BitPerPixel,DisplaySize>
-# "UBD" session per <User,BitPerPixel,DisplaySize>
-# "UBI" session per <User,BitPerPixel,IPAddr>
-# "UBC" session per <User,BitPerPixel,Connection>
-# "UBDI" session per <User,BitPerPixel,DisplaySize,IPAddr>
-# "UBDC" session per <User,BitPerPixel,DisplaySize,Connection>
+;; Policy - session allocation policy
+; Type: enum [ "Default" | "UBD" | "UBI" | "UBC" | "UBDI" | "UBDC" ]
+; Default: Xrdp:<User,BitPerPixel> and Xvnc:<User,BitPerPixel,DisplaySize>
+; "UBD" session per <User,BitPerPixel,DisplaySize>
+; "UBI" session per <User,BitPerPixel,IPAddr>
+; "UBC" session per <User,BitPerPixel,Connection>
+; "UBDI" session per <User,BitPerPixel,DisplaySize,IPAddr>
+; "UBDC" session per <User,BitPerPixel,DisplaySize,Connection>
 Policy=Default
 
 [Logging]
@@ -63,33 +62,33 @@ EnableSyslog=1
 SyslogLevel=DEBUG
 
 [X11rdp]
-param1=-bs
-param2=-ac
-param3=-nolisten
-param4=tcp
-param5=-uds
+param=X11rdp
+param=-bs
+param=-nolisten
+param=tcp
+param=-uds
 
 [Xvnc]
-param1=-bs
-param2=-ac
-param3=-nolisten
-param4=tcp
-param5=-localhost
-param6=-dpi
-param7=96
+param=Xvnc
+param=-bs
+param=-nolisten
+param=tcp
+param=-localhost
+param=-dpi
+param=96
 
 [Xorg]
-param1=-config
-param2=xrdp/xorg.conf
-param3=-logfile
-param4=/dev/null
-param5=-noreset
-param6=-ac
-param7=-nolisten
-param8=tcp
+param=Xorg
+param=-config
+param=xrdp/xorg.conf
+param=-noreset
+param=-nolisten
+param=tcp
+param=-logfile
+param=.xorgxrdp.%s.log
 
 [Chansrv]
-# drive redirection, defaults to xrdp_client if not set
+; drive redirection, defaults to xrdp_client if not set
 FuseMountName=thinclient_drives
 
 [SessionVariables]