diff options
| author | metalefty <meta@vmeta.jp> | 2018-06-14 11:04:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 11:04:43 +0900 |
| commit | f83d967f46b34cb1d3d08f12edbec8521dcc4888 (patch) | |
| tree | fcdfd944d207750e2cd399832611cd31f5f6063d /sesman/session.c | |
| parent | 91c5ee4475a52515195f44767b7bfaa32a6fd4e2 (diff) | |
| parent | cde5b0912907a279e4a2e1694690d308b318fc12 (diff) | |
| download | xrdp-proprietary-f83d967f46b34cb1d3d08f12edbec8521dcc4888.tar.gz xrdp-proprietary-f83d967f46b34cb1d3d08f12edbec8521dcc4888.zip | |
Merge pull request #1120 from matt335672/set-env-on-reconnect
Copy the PAM session environment for the reconnect script
Diffstat (limited to 'sesman/session.c')
| -rw-r--r-- | sesman/session.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sesman/session.c b/sesman/session.c index 0a80bd8a..d33f2f5f 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -860,7 +860,7 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c, /******************************************************************************/ /* called with the main thread */ static int -session_reconnect_fork(int display, char *username) +session_reconnect_fork(int display, char *username, long data) { int pid; char text[256]; @@ -877,6 +877,7 @@ session_reconnect_fork(int display, char *username) display, g_cfg->env_names, g_cfg->env_values); + auth_set_env(data); g_snprintf(text, 255, "%s/%s", XRDP_CFG_PATH, "reconnectwm.sh"); if (g_file_exist(text)) @@ -904,9 +905,9 @@ session_start(long data, tui8 type, struct SCP_CONNECTION *c, /* called by a worker thread, ask the main thread to call session_sync_start and wait till done */ int -session_reconnect(int display, char *username) +session_reconnect(int display, char *username, long data) { - return session_reconnect_fork(display, username); + return session_reconnect_fork(display, username, data); } /******************************************************************************/ |