mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy the PAM session environment for the reconnect script

Browse Source 
This provides access to variables set at login which may be
required by the script (e.g. KRB5CCNAME)
This commit is contained in:
matt335672 2018-05-31 10:30:11 +01:00
parent 57015aa088
commit cde5b09129
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sesman/scp_v0.c
View File

@ -96,7 +96,7 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
s_item->pid);
}
session_reconnect(display, s->username);
session_reconnect(display, s->username, data);
}
else
{

7
sesman/session.c
View File

@ -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);
}
/******************************************************************************/

2
sesman/session.h
View File

@ -109,7 +109,7 @@ session_start(long data, tui8 type, struct SCP_CONNECTION *c,
struct SCP_SESSION *s);
int
session_reconnect(int display, char* username);
session_reconnect(int display, char *username, long data);
/**
*