VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/utmp.c: Use the appropriate autotools macros for struct utmpx

Browse Source 
Recently, we started using utmpx instead of utmp, and we updated
<./configure.ac> to do the checks for 'struct utmpx' instead of
'struct utmp'.  However, I forgot to update the preprocessor
conditionals accordingly.

Fixes: 64bcb54fa9 ("lib/, src/, configure.ac: Use utmpx instead of utmp")
Link: <https://github.com/shadow-maint/shadow/pull/954>
Cc: Firas Khalil Khana <firasuke@gmail.com>
Cc: "A. Wilfox" <https://github.com/awilfox>
Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-02-20 19:15:41 +01:00
parent 2806b827d8
commit 1af6b68cbe
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/utmp.c
View File

@@ -183,7 +183,7 @@ get_session_host(char **out)
ut = get_current_utmp(); ut = get_current_utmp();
#if defined(HAVE_STRUCT_UTMP_UT_HOST) #if defined(HAVE_STRUCT_UTMPX_UT_HOST)
if ((ut != NULL) && (ut->ut_host[0] != '\0')) { if ((ut != NULL) && (ut->ut_host[0] != '\0')) {
char *hostname; char *hostname;
@@ -258,7 +258,7 @@ prepare_utmp(const char *name, const char *line, const char *host,
&& ('\0' != host[0])) { && ('\0' != host[0])) {
hostname = XMALLOC(strlen(host) + 1, char); hostname = XMALLOC(strlen(host) + 1, char);
strcpy (hostname, host); strcpy (hostname, host);
#if defined(HAVE_STRUCT_UTMP_UT_HOST) #if defined(HAVE_STRUCT_UTMPX_UT_HOST)
} else if ( (NULL != ut) } else if ( (NULL != ut)
&& ('\0' != ut->ut_host[0])) { && ('\0' != ut->ut_host[0])) {
hostname = XMALLOC(NITEMS(ut->ut_host) + 1, char); hostname = XMALLOC(NITEMS(ut->ut_host) + 1, char);
@@ -283,20 +283,20 @@ prepare_utmp(const char *name, const char *line, const char *host,
/* XXX - assumes /dev/tty?? */ /* XXX - assumes /dev/tty?? */
STRNCPY(utent->ut_id, line + 3); STRNCPY(utent->ut_id, line + 3);
} }
#if defined(HAVE_STRUCT_UTMP_UT_NAME) #if defined(HAVE_STRUCT_UTMPX_UT_NAME)
STRNCPY(utent->ut_name, name); STRNCPY(utent->ut_name, name);
#endif #endif
STRNCPY(utent->ut_user, name); STRNCPY(utent->ut_user, name);
if (NULL != hostname) { if (NULL != hostname) {
struct addrinfo *info = NULL; struct addrinfo *info = NULL;
#if defined(HAVE_STRUCT_UTMP_UT_HOST) #if defined(HAVE_STRUCT_UTMPX_UT_HOST)
STRNCPY(utent->ut_host, hostname); STRNCPY(utent->ut_host, hostname);
#endif #endif
#if defined(HAVE_STRUCT_UTMP_UT_SYSLEN) #if defined(HAVE_STRUCT_UTMPX_UT_SYSLEN)
utent->ut_syslen = MIN (strlen (hostname), utent->ut_syslen = MIN (strlen (hostname),
sizeof (utent->ut_host)); sizeof (utent->ut_host));
#endif #endif
#if defined(HAVE_STRUCT_UTMP_UT_ADDR) || defined(HAVE_STRUCT_UTMP_UT_ADDR_V6) #if defined(HAVE_STRUCT_UTMPX_UT_ADDR) || defined(HAVE_STRUCT_UTMPX_UT_ADDR_V6)
if (getaddrinfo (hostname, NULL, NULL, &info) == 0) { if (getaddrinfo (hostname, NULL, NULL, &info) == 0) {
/* getaddrinfo might not be reliable. /* getaddrinfo might not be reliable.
* Just try to log what may be useful. * Just try to log what may be useful.
@@ -304,13 +304,13 @@ prepare_utmp(const char *name, const char *line, const char *host,
if (info->ai_family == AF_INET) { if (info->ai_family == AF_INET) {
struct sockaddr_in *sa = struct sockaddr_in *sa =
(struct sockaddr_in *) info->ai_addr; (struct sockaddr_in *) info->ai_addr;
# if defined(HAVE_STRUCT_UTMP_UT_ADDR) # if defined(HAVE_STRUCT_UTMPX_UT_ADDR)
memcpy (&(utent->ut_addr), memcpy (&(utent->ut_addr),
&(sa->sin_addr), &(sa->sin_addr),
MIN (sizeof (utent->ut_addr), MIN (sizeof (utent->ut_addr),
sizeof (sa->sin_addr))); sizeof (sa->sin_addr)));
# endif # endif
# if defined(HAVE_STRUCT_UTMP_UT_ADDR_V6) # if defined(HAVE_STRUCT_UTMPX_UT_ADDR_V6)
memcpy (utent->ut_addr_v6, memcpy (utent->ut_addr_v6,
&(sa->sin_addr), &(sa->sin_addr),
MIN (sizeof (utent->ut_addr_v6), MIN (sizeof (utent->ut_addr_v6),
@@ -332,10 +332,10 @@ prepare_utmp(const char *name, const char *line, const char *host,
/* ut_exit is only for DEAD_PROCESS */ /* ut_exit is only for DEAD_PROCESS */
utent->ut_session = getsid (0); utent->ut_session = getsid (0);
if (gettimeofday (&tv, NULL) == 0) { if (gettimeofday (&tv, NULL) == 0) {
#if defined(HAVE_STRUCT_UTMP_UT_TIME) #if defined(HAVE_STRUCT_UTMPX_UT_TIME)
utent->ut_time = tv.tv_sec; utent->ut_time = tv.tv_sec;
#endif #endif
#if defined(HAVE_STRUCT_UTMP_UT_XTIME) #if defined(HAVE_STRUCT_UTMPX_UT_XTIME)
utent->ut_xtime = tv.tv_usec; utent->ut_xtime = tv.tv_usec;
#endif #endif
utent->ut_tv.tv_sec = tv.tv_sec; utent->ut_tv.tv_sec = tv.tv_sec;