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

Cosmetic fixes for minor issues

Browse Source
This commit is contained in:
matt335672 2020-12-14 11:35:31 +00:00
parent bfe76e0499
commit 7ddc43aeea
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -79,7 +79,7 @@ AC_ARG_ENABLE(ipv6only, AS_HELP_STRING([--enable-ipv6only],
[Build IPv6-only (default: no)]), [Build IPv6-only (default: no)]),
[], [enable_ipv6only=no]) [], [enable_ipv6only=no])
AC_ARG_ENABLE(kerberos, AS_HELP_STRING([--enable-kerberos], AC_ARG_ENABLE(kerberos, AS_HELP_STRING([--enable-kerberos],
[Build kerberos support (default: no)]), [Build kerberos support (prefer PAM if available) (default: no)]),
[], [enable_kerberos=no]) [], [enable_kerberos=no])
AC_ARG_ENABLE(bsd, AS_HELP_STRING([--enable-bsd], AC_ARG_ENABLE(bsd, AS_HELP_STRING([--enable-bsd],
[Build BSD auth support (default: no)]), [Build BSD auth support (default: no)]),

2
sesman/chansrv/chansrv.c
View File

@ -1799,7 +1799,7 @@ main(int argc, char **argv)
return 1; return 1;
} }
LOG_DEVEL(LOG_LEVEL_ALWAYS, "main: app started pid %d(0x%8.8x)", pid, pid); LOG_DEVEL(LOG_LEVEL_INFO, "main: app started pid %d(0x%8.8x)", pid, pid);
/* set up signal handler */ /* set up signal handler */
g_signal_terminate(term_signal_handler); /* SIGTERM */ g_signal_terminate(term_signal_handler); /* SIGTERM */
g_signal_user_interrupt(term_signal_handler); /* SIGINT */ g_signal_user_interrupt(term_signal_handler); /* SIGINT */

28
sesman/session.c
View File

@ -807,15 +807,33 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c,
} }
else else
{ {
int wm_wait_time;
wait_for_xserver(display); wait_for_xserver(display);
chansrv_pid = session_start_chansrv(s->username, display); chansrv_pid = session_start_chansrv(s->username, display);
LOG(LOG_LEVEL_ALWAYS, "waiting for window manager "
/* Monitor the amount of time we wait for the
* window manager. This is approximately how long the window
* manager was running for */
LOG(LOG_LEVEL_INFO, "waiting for window manager "
"(pid %d) to exit", window_manager_pid); "(pid %d) to exit", window_manager_pid);
wm_wait_time = g_time1();
g_waitpid(window_manager_pid); g_waitpid(window_manager_pid);
LOG(LOG_LEVEL_ALWAYS, "window manager (pid %d) did " wm_wait_time = g_time1() - wm_wait_time;
"exit, cleaning up session", window_manager_pid); if (wm_wait_time < 10)
LOG(LOG_LEVEL_INFO, "calling auth_stop_session and " {
"auth_end from pid %d", g_getpid()); /* This could be a config issue. Log a significant error */
LOG(LOG_LEVEL_ALWAYS, "window manager exited quickly "
"(%d secs). Window manager config problem?",
wm_wait_time);
}
else
{
LOG(LOG_LEVEL_INFO, "window manager (pid %d) was running "
"for approximately %d seconds.",
window_manager_pid, wm_wait_time);
}
LOG(LOG_LEVEL_INFO, "Cleaning up session. Calling "
"auth_stop_session and auth_end from pid %d", g_getpid());
auth_stop_session(data); auth_stop_session(data);
auth_end(data); auth_end(data);
g_sigterm(display_pid); g_sigterm(display_pid);