From d6c44586838772a91eb3c4320c4130cc9292fcaf Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Fri, 20 Oct 2023 15:48:33 -0700 Subject: [PATCH] waitforx fixes --- .gitignore | 2 ++ sesman/Makefile.am | 15 ++------------- sesman/session.c | 4 ++-- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index c5026d15c8..f93d58fc6b 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,8 @@ tests/memtest/memtest tests/xrdp/test_xrdp tools/devel/tcp_proxy/tcp_proxy *.trs +waitforx/xrdp-waitforx +xorgxrdp_helper/xorgxrdp_helper xrdp/xrdp xrdp/xrdp.ini xrdp_configure_options.h diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 6a1ca6b6e1..cc8e37d514 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -60,19 +60,8 @@ xrdp_sesman_SOURCES = \ xauth.c \ xauth.h \ xwait.c \ - xwait.h - -# Possible authentication modules -# See https://www.gnu.org/software/automake/manual/html_node/Conditional-Sources.html -EXTRA_xrdp_sesman_SOURCES = \ - verify_user.c \ - verify_user_bsd.c \ - verify_user_kerberos.c \ - verify_user_pam.c \ - verify_user_pam_userpass.c - -# Make sure the right authentication module is pulled in -xrdp_sesman_DEPENDENCIES = $(AUTHMOD_OBJ) + xwait.h \ + $(AUTH_C) xrdp_sesman_LDADD = \ $(top_builddir)/libipm/libipm.la \ diff --git a/sesman/session.c b/sesman/session.c index 89a80ee094..090c37dac5 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -541,7 +541,7 @@ session_start(struct auth_info *auth_info, } else if (window_manager_pid == 0) { - env_set_user(s->uid, + env_set_user(s->username, 0, display, g_cfg->env_names, @@ -824,7 +824,7 @@ session_start(struct auth_info *auth_info, struct exit_status xserver_exit_status; struct exit_status chansrv_exit_status; - chansrv_pid = session_start_chansrv(s->uid, display); + chansrv_pid = session_start_chansrv(s->username, display); LOG(LOG_LEVEL_INFO, "Session started successfully for user %s on display %d",