xrdp-next/xrdp-0.9.7-scripts-libexec.patch
2018-07-04 16:38:17 +10:00

38 lines
1.9 KiB
Diff

diff -ruN xrdp-0.9.7-v/sesman/config.c xrdp-0.9.7/sesman/config.c
--- xrdp-0.9.7-v/sesman/config.c 2018-06-29 18:06:27.000000000 +1000
+++ xrdp-0.9.7/sesman/config.c 2018-07-04 16:21:43.009286795 +1000
@@ -181,13 +181,13 @@
g_free(cf->default_wm);
cf->default_wm = g_strdup("startwm.sh");
}
- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */
+ /* if default_wm doesn't begin with '/', it's a relative path to /usr/libexec/xrdp */
if (cf->default_wm[0] != '/')
{
/* sizeof operator returns string length including null terminator */
- length = sizeof(XRDP_CFG_PATH) + g_strlen(g_cfg->default_wm) + 1; /* '/' */
+ length = sizeof("/usr/libexec/xrdp") + g_strlen(g_cfg->default_wm) + 1; /* '/' */
buf = (char *)g_malloc(length, 0);
- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, g_cfg->default_wm);
+ g_sprintf(buf, "%s/%s", "/usr/libexec/xrdp", g_cfg->default_wm);
g_free(g_cfg->default_wm);
g_cfg->default_wm = g_strdup(buf);
g_free(buf);
@@ -202,13 +202,13 @@
g_free(cf->reconnect_sh);
cf->reconnect_sh = g_strdup("reconnectwm.sh");
}
- /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */
+ /* if reconnect_sh doesn't begin with '/', it's a relative path to /usr/libexec/xrdp */
if (cf->reconnect_sh[0] != '/')
{
/* sizeof operator returns string length including null terminator */
- length = sizeof(XRDP_CFG_PATH) + g_strlen(g_cfg->reconnect_sh) + 1; /* '/' */
+ length = sizeof("/usr/libexec/xrdp") + g_strlen(g_cfg->reconnect_sh) + 1; /* '/' */
buf = (char *)g_malloc(length, 0);
- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, g_cfg->reconnect_sh);
+ g_sprintf(buf, "%s/%s", "/usr/libexec/xrdp", g_cfg->reconnect_sh);
g_free(g_cfg->reconnect_sh);
g_cfg->reconnect_sh = g_strdup(buf);
g_free(buf);