diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-05-09 16:02:19 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-05-09 16:02:19 -0700 |
| commit | 49fcc23673323a850b7aaf9ae1025cfd14d0adba (patch) | |
| tree | f0c74b982c2d80715434f5624d57b8f02df63e00 /sesman/session.c | |
| parent | 3819fa5e72e7735d95fe7992368e242aabc75232 (diff) | |
| download | xrdp-proprietary-49fcc23673323a850b7aaf9ae1025cfd14d0adba.tar.gz xrdp-proprietary-49fcc23673323a850b7aaf9ae1025cfd14d0adba.zip | |
sesman: added SessionVariables to sesman.ini and some indent cleanup
Diffstat (limited to 'sesman/session.c')
| -rw-r--r-- | sesman/session.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sesman/session.c b/sesman/session.c index 6b49a3fb..091ce013 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -288,7 +288,8 @@ session_start_sessvc(int xpid, int wmpid, long data, char *username, int display list_add_item(sessvc_params, (long)g_strdup(wmpid_str)); list_add_item(sessvc_params, 0); /* mandatory */ - env_set_user(username, 0, display); + env_set_user(username, 0, display, + g_cfg->session_variables1, g_cfg->session_variables2); /* executing sessvc */ g_execvp(exe_path, ((char **)sessvc_params->items)); @@ -501,7 +502,9 @@ session_start_fork(int width, int height, int bpp, char *username, } else if (pampid == 0) /* child: X11/client */ { - env_set_user(username, 0, display); + env_set_user(username, 0, display, + g_cfg->session_variables1, + g_cfg->session_variables2); if (x_server_running(display)) { auth_set_env(data); @@ -594,7 +597,9 @@ session_start_fork(int width, int height, int bpp, char *username, } else if (xpid == 0) /* child */ { - env_set_user(username, passwd_file, display); + env_set_user(username, passwd_file, display, + g_cfg->session_variables1, + g_cfg->session_variables2); env_check_password_file(passwd_file, password); g_snprintf(text, 255, "%d", g_cfg->sess.max_idle_time); @@ -774,7 +779,8 @@ session_reconnect_fork(int display, char *username) } else if (pid == 0) { - env_set_user(username, 0, display); + env_set_user(username, 0, display, + g_cfg->session_variables1, g_cfg->session_variables2); g_snprintf(text, 255, "%s/%s", XRDP_CFG_PATH, "reconnectwm.sh"); if (g_file_exist(text)) |