waitforx fixes

jsorg71 · Oct 20, 2023 · d6c4458 · d6c4458
1 parent 5875f39
commit d6c4458
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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",