From 59f3a79fe430de3979c99a1bcdc74ee5b1990224 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 27 Aug 2018 10:47:05 +0900 Subject: [PATCH 1/2] sesman: pass pulse socket name via environment variable --- sesman/env.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sesman/env.c b/sesman/env.c index c897f1b3..46d261d4 100644 --- a/sesman/env.c +++ b/sesman/env.c @@ -30,6 +30,7 @@ #include +#include "xrdp_sockets.h" #include "list.h" #include "sesman.h" #include "ssl_calls.h" @@ -143,6 +144,12 @@ env_set_user(const char *username, char **passwd_file, int display, g_setenv("XRDP_SESSION", "1", 1); /* XRDP_SOCKET_PATH should be set even here, chansrv uses this */ g_setenv("XRDP_SOCKET_PATH", XRDP_SOCKET_PATH, 1); + /* pulse sink socket */ + g_snprintf(text, sizeof(text) - 1, CHANSRV_PORT_OUT_BASE_STR, display); + g_setenv("CHANSRV_PULSE_SINK_SOCKET", text, 1); + /* pulse source socket */ + g_snprintf(text, sizeof(text) - 1, CHANSRV_PORT_IN_BASE_STR, display); + g_setenv("CHANSRV_PULSE_SOURCE_SOCKET", text, 1); if ((env_names != 0) && (env_values != 0) && (env_names->count == env_values->count)) { From d6992cf62d505ceca712993e3854cd0289698d9e Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 27 Aug 2018 15:19:14 +0900 Subject: [PATCH 2/2] sesman: add XRDP_ prefix to xrdp related environment variable and remove CHANSRV, use the shorter name --- sesman/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sesman/env.c b/sesman/env.c index 46d261d4..b097f38c 100644 --- a/sesman/env.c +++ b/sesman/env.c @@ -146,10 +146,10 @@ env_set_user(const char *username, char **passwd_file, int display, g_setenv("XRDP_SOCKET_PATH", XRDP_SOCKET_PATH, 1); /* pulse sink socket */ g_snprintf(text, sizeof(text) - 1, CHANSRV_PORT_OUT_BASE_STR, display); - g_setenv("CHANSRV_PULSE_SINK_SOCKET", text, 1); + g_setenv("XRDP_PULSE_SINK_SOCKET", text, 1); /* pulse source socket */ g_snprintf(text, sizeof(text) - 1, CHANSRV_PORT_IN_BASE_STR, display); - g_setenv("CHANSRV_PULSE_SOURCE_SOCKET", text, 1); + g_setenv("XRDP_PULSE_SOURCE_SOCKET", text, 1); if ((env_names != 0) && (env_values != 0) && (env_names->count == env_values->count)) {