diff --git a/docs/man/xrdp.ini.5.in b/docs/man/xrdp.ini.5.in index 88602c0e..048aaa9f 100644 --- a/docs/man/xrdp.ini.5.in +++ b/docs/man/xrdp.ini.5.in @@ -30,11 +30,11 @@ examples can be found within xrdp.ini itself. .TP \fBvmconnect\fR=\fI[true|false]\fR -(Hyper-V VMs only). Allows the user to skip some unnecessary security -checks when a virtual machine running xrdp is hosted on Hyper-V, -and the user connects to it via the vmms service on TCP port 2179. -In this configuration, RDP security is handled by the vmms service, and -security features which are not yet added to xrdp itself can be supported. +(Hyper-V VMs only). Enables a wider support of security protocols when a +virtual machine running xrdp is hosted on Hyper-V, and the user connects +to it via the vmms service on TCP port 2179. In this configuration, +RDP security is handled by the vmms service, and security features which +are not yet added to xrdp itself can be supported. This parameter is required in environments which do not support 'classic' RDP encryption. diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c index 0b7a453d..e41be7d1 100644 --- a/xrdp/xrdp.c +++ b/xrdp/xrdp.c @@ -332,6 +332,9 @@ read_xrdp_ini_startup_params(struct xrdp_startup_params *startup_params) else if (g_strcasecmp(name, "use_vsock") == 0) { + LOG(LOG_LEVEL_WARNING, + "Config parameter 'use_vsock' is obsolete. " + "Use 'port=vsock://...' instead"); startup_params->use_vsock = g_text2bool(val); } diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in index 0e26f96b..512bf3ec 100644 --- a/xrdp/xrdp.ini.in +++ b/xrdp/xrdp.ini.in @@ -22,11 +22,6 @@ fork=true ; port=vsock://: port=3389 -; 'port' above should be connected to with vsock instead of tcp -; use this only with number alone in port above -; prefer use vsock://: above -use_vsock=false - ; if used inside a Hyper-V VM through vmconnect and bound on vsock, ; turn this on to enable wider security protocol support. #vmconnect=true