Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix systemd sessions #779

Closed
wants to merge 2 commits into from
Closed

Fix systemd sessions #779

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e32d000
Move the session creation inside of the child fork. This will allow …
geiseri Jun 19, 2017
7c0eef8
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into fix…
geiseri Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions sesman/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ session_start_chansrv(char *username, int display)
chansrv_pid = g_fork();
if (chansrv_pid == 0)
{
chansrv_params = list_create();
chansrv_params = list_create();
chansrv_params->auto_free = 1;

/* building parameters */
Expand Down Expand Up @@ -457,7 +457,7 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c,
return 0;
}

auth_start_session(data, display);

pid = g_fork(); /* parent is fork from tcp accept,
child forks X and wm, then becomes scp */

Expand All @@ -466,6 +466,7 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c,
}
else if (pid == 0)
{
auth_start_session(data, display);
g_delete_wait_obj(g_term_event);
g_tcp_close(g_sck);
g_tcp_close(c->in_sck);
Expand Down