From e284e1c09d2b0981df46979805b002f77a92d626 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Mar 2019 18:56:33 -0500 Subject: [PATCH] Disable SHM access between XUP and Xorg as they are not running on the same machine --- sesman/session.c | 2 ++ xorg/X11R7.6/rdp/rdpup.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sesman/session.c b/sesman/session.c index e0c83326..8fd83023 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -931,6 +931,8 @@ session_start_fork(int width, int height, int bpp, char *username, 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("-reset")); + list_add_item(xserver_params, (tintptr)g_strdup("-extension")); + list_add_item(xserver_params, (tintptr)g_strdup("MIT-SHM")); // list_add_item(xserver_params, (tintptr)g_strdup("-terminate")); /* additional parameters from sesman.ini file */ diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index 54eb779d..226ac09e 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define LLOGLN(_level, _args) \ do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0) -static int g_use_shmem = 1; /* turns on or off */ +static int g_use_shmem = 0; /* turns on or off */ static int g_shmemid = -1; static char *g_shmemptr = 0; static int g_shmem_lineBytes = 0;