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

Don't use DEAD_PROCESS/USER_PROCESS for add_xtmp_entry

Browse Source 
If we're not compiling with USE_UTMP, these defines will not
be available
This commit is contained in:
matt335672
2023-06-30 10:45:14 +01:00
parent 3b6c9bcba3
commit 98d6545566
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sesman/sesexec/sessionrecord.c
+20 -7
View File
@@ -31,6 +31,21 @@
#include <config_ac.h> #include <config_ac.h>
#endif #endif
#include "sessionrecord.h"
#include "login_info.h"
#include "log.h"
// Operational mode of add_xtmp_entry()
//
// We can't use USER_PROCESS/DEAD_PROCESS directly, as they
// won't be available for platforms without USE_UTMP
enum add_xtmp_mode
{
MODE_LOGIN,
MODE_LOGOUT
};
#ifdef USE_UTMP #ifdef USE_UTMP
#include <pwd.h> #include <pwd.h>
@@ -50,20 +65,18 @@ typedef struct utmp _utmp;
#endif // USE_UTMP #endif // USE_UTMP
#include "log.h"
#include "os_calls.h" #include "os_calls.h"
#include "string_calls.h" #include "string_calls.h"
#include "sessionrecord.h"
#define XRDP_LINE_FORMAT "xrdp:%d" #define XRDP_LINE_FORMAT "xrdp:%d"
/* /*
* Prepare the utmp struct and write it. * Prepare the utmp struct and write it.
* this can handle login and logout at once with the 'state' parameter * this can handle login and logout at once with the 'mode' parameter
*/ */
void void
add_xtmp_entry(int pid, const char *display_id, const char *user, const char *rhostname, const short state) add_xtmp_entry(int pid, const char *display_id, const char *user, const char *rhostname, enum add_xtmp_mode mode)
{ {
#if USE_UTMP #if USE_UTMP
_utmp ut; _utmp ut;
@@ -71,7 +84,7 @@ add_xtmp_entry(int pid, const char *display_id, const char *user, const char *rh
g_memset(&ut, 0, sizeof(ut)); g_memset(&ut, 0, sizeof(ut));
ut.ut_type = state; ut.ut_type = (mode == MODE_LOGIN) ? USER_PROCESS : DEAD_PROCESS;
ut.ut_pid = pid; ut.ut_pid = pid;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
ut.ut_tv.tv_sec = tv.tv_sec; ut.ut_tv.tv_sec = tv.tv_sec;
@@ -101,7 +114,7 @@ utmp_login(int pid, int display, const char *user, const char *rhostname)
pid, display, user, rhostname); pid, display, user, rhostname);
g_snprintf(str_display, 15, XRDP_LINE_FORMAT, display); g_snprintf(str_display, 15, XRDP_LINE_FORMAT, display);
add_xtmp_entry(pid, str_display, user, rhostname, USER_PROCESS); add_xtmp_entry(pid, str_display, user, rhostname, MODE_LOGIN);
} }
void void
@@ -114,5 +127,5 @@ utmp_logout(int pid, int display, const char *user, const char *rhostname)
pid, display, user, rhostname); pid, display, user, rhostname);
g_snprintf(str_display, 15, XRDP_LINE_FORMAT, display); g_snprintf(str_display, 15, XRDP_LINE_FORMAT, display);
add_xtmp_entry(pid, str_display, user, rhostname, DEAD_PROCESS); add_xtmp_entry(pid, str_display, user, rhostname, MODE_LOGOUT);
} }