diff options
author | Koichiro IWAO <meta@vmeta.jp> | 2018-06-14 11:59:27 +0900 |
---|---|---|
committer | Koichiro IWAO <meta@vmeta.jp> | 2018-06-16 16:44:37 +0900 |
commit | e82f212f34abee9e09383bd2908e98f7359f7ca9 (patch) | |
tree | 0e43ebb94c760f89210721f0a179d52bdd1f1a14 /sesman/session.c | |
parent | 036c29212037d7cb3bd79b3c90a33542ea5704cf (diff) | |
download | xrdp-proprietary-e82f212f34abee9e09383bd2908e98f7359f7ca9.tar.gz xrdp-proprietary-e82f212f34abee9e09383bd2908e98f7359f7ca9.zip |
sesman: accept full path for DefaultWindowManager
Solves: #1143
Also, this idea is inspired by Fedora's patch [1]. Some distro wants to
put all scripts in libexec directory due to SELinux. This enables
distros to put such scripts anywhere.
[1] https://src.fedoraproject.org/cgit/rpms/xrdp.git/tree/xrdp-0.9.6-scripts-libexec.patch?id=02f845c1b8cea781313cf3e9efcd6d7d50341824
Diffstat (limited to 'sesman/session.c')
-rw-r--r-- | sesman/session.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sesman/session.c b/sesman/session.c index d33f2f5f..3c128ebb 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -575,8 +575,7 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c, } /* if we're here something happened to g_execlp3 so we try running the default window manager */ - g_sprintf(text, "%s/%s", XRDP_CFG_PATH, g_cfg->default_wm); - g_execlp3(text, g_cfg->default_wm, 0); + g_execlp3(g_cfg->default_wm, g_cfg->default_wm, 0); log_message(LOG_LEVEL_ALWAYS, "error starting default " "wm for user %s - pid %d", s->username, g_getpid()); |