diff options
| author | Koichiro IWAO <meta@vmeta.jp> | 2017-12-15 17:56:45 +0900 |
|---|---|---|
| committer | Koichiro IWAO <meta@vmeta.jp> | 2018-01-11 10:57:47 +0900 |
| commit | 08f847d74b8e5b37650746f48c1333453cb04b15 (patch) | |
| tree | 2bfa8e49014f35cfda5443d8f7e0595355b89749 /sesman/session.c | |
| parent | dcf64e43ca91474c047ba01df15feadc8e3a142c (diff) | |
| download | xrdp-proprietary-08f847d74b8e5b37650746f48c1333453cb04b15.tar.gz xrdp-proprietary-08f847d74b8e5b37650746f48c1333453cb04b15.zip | |
sesman: refactor, change variable names
session_variables1 -> env_names
session_variables2 -> env_values
Use the name used in callee function env_set_user(). The former names
are not clear.
Diffstat (limited to 'sesman/session.c')
| -rw-r--r-- | sesman/session.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sesman/session.c b/sesman/session.c index 92c6002c..1ce358b9 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -371,8 +371,8 @@ session_start_chansrv(char *username, int display) list_add_item(chansrv_params, 0); /* mandatory */ env_set_user(username, 0, display, - g_cfg->session_variables1, - g_cfg->session_variables2); + g_cfg->env_names, + g_cfg->env_values); /* executing chansrv */ g_execvp(exe_path, (char **) (chansrv_params->items)); @@ -513,8 +513,8 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c, env_set_user(s->username, 0, display, - g_cfg->session_variables1, - g_cfg->session_variables2); + g_cfg->env_names, + g_cfg->env_values); if (x_server_running(display)) { auth_set_env(data); @@ -604,16 +604,16 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c, env_set_user(s->username, &passwd_file, display, - g_cfg->session_variables1, - g_cfg->session_variables2); + g_cfg->env_names, + g_cfg->env_values); } else { env_set_user(s->username, 0, display, - g_cfg->session_variables1, - g_cfg->session_variables2); + g_cfg->env_names, + g_cfg->env_values); } @@ -857,8 +857,8 @@ session_reconnect_fork(int display, char *username) env_set_user(username, 0, display, - g_cfg->session_variables1, - g_cfg->session_variables2); + g_cfg->env_names, + g_cfg->env_values); g_snprintf(text, 255, "%s/%s", XRDP_CFG_PATH, "reconnectwm.sh"); if (g_file_exist(text)) |