sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xrdp: Do not pass -rfbauth without passwd_file

Browse Source
This commit is contained in:
Tee KOBAYASHI 2022-05-04 11:01:39 +09:00 committed by xtkoba
parent 1754e30e09
commit 3fe664338f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-packages/xrdp/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="An open source remote desktop protocol (RDP) server"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.9.16
TERMUX_PKG_REVISION=7
TERMUX_PKG_REVISION=8
TERMUX_PKG_SRCURL=https://github.com/neutrinolabs/xrdp/releases/download/v${TERMUX_PKG_VERSION}/xrdp-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=72a86bf3bb8ca3a41905bfa84f500ad73cd23615753f34db7e36278a33c19916
TERMUX_PKG_DEPENDS="libandroid-shmem, libcrypt, libice, libsm, libuuid, libx11, libxau, libxcb, libxfixes, libxdmcp, libxrandr, openssl-1.1, procps, tigervnc"

18
x11-packages/xrdp/fix-rfbauth-with-no-passwd-file.patch Normal file
View File

@ -0,0 +1,18 @@
Fixes https://github.com/termux/termux-packages/issues/10220.
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -768,8 +768,11 @@
list_add_item(xserver_params, (tintptr)g_strdup(geometry));
list_add_item(xserver_params, (tintptr)g_strdup("-depth"));
list_add_item(xserver_params, (tintptr)g_strdup(depth));
- list_add_item(xserver_params, (tintptr)g_strdup("-rfbauth"));
- list_add_item(xserver_params, (tintptr)g_strdup(passwd_file));
+ if (passwd_file != 0 && *passwd_file != '\0')
+ {
+ list_add_item(xserver_params, (tintptr)g_strdup("-rfbauth"));
+ list_add_item(xserver_params, (tintptr)g_strdup(passwd_file));
+ }
g_free(passwd_file);