Skip to content

Assume ut_host is supported, and ut_name is not supported #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alejandro-colomar wants to merge 2 commits into
base: master
Choose a base branch
from
+1 −15
Open

Assume ut_host is supported, and ut_name is not supported #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3e27d
configure.ac, lib/utmp.c: Assume ut_host is supported
alejandro-colomar Dec 12, 2025
92eeb29
configure.ac, lib/utmp.c: Assume ut_name is not supported
alejandro-colomar Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ AC_SYS_LARGEFILE

dnl Checks for typedefs, structures, and compiler characteristics.

AC_CHECK_MEMBERS([struct utmpx.ut_name,
struct utmpx.ut_host,
struct utmpx.ut_syslen,
AC_CHECK_MEMBERS([struct utmpx.ut_syslen,
struct utmpx.ut_addr,
struct utmpx.ut_addr_v6,
struct utmpx.ut_time,
Expand Down
12 changes: 0 additions & 12 deletions lib/utmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,12 @@ get_session_host(char **out, pid_t main_pid)

ut = get_current_utmp(main_pid);

#if defined(HAVE_STRUCT_UTMPX_UT_HOST)
if ((ut != NULL) && !strneq_a(ut->ut_host, "")) {
*out = xstrndup_a(ut->ut_host);
} else {
*out = NULL;
ret = -2;
}
#else
*out = NULL;
ret = -2;
#endif

free(ut);

Expand Down Expand Up @@ -277,10 +272,8 @@ prepare_utmp(const char *name, const char *line, const char *host,

if (NULL != host && !streq(host, ""))
hostname = xstrdup(host);
#if defined(HAVE_STRUCT_UTMPX_UT_HOST)
else if (NULL != ut && !strneq_a(ut->ut_host, ""))
hostname = xstrndup_a(ut->ut_host);
#endif

line = strprefix(line, "/dev/") ?: line;

Expand All @@ -296,15 +289,10 @@ prepare_utmp(const char *name, const char *line, const char *host,
} else {
strncpy_a(utent->ut_id, strnul(line) - MIN(strlen(line), countof(utent->ut_id)));
}
#if defined(HAVE_STRUCT_UTMPX_UT_NAME)
strncpy_a(utent->ut_name, name);
#endif
strncpy_a(utent->ut_user, name);
if (NULL != hostname) {
struct addrinfo *info = NULL;
#if defined(HAVE_STRUCT_UTMPX_UT_HOST)
strncpy_a(utent->ut_host, hostname);
#endif
#if defined(HAVE_STRUCT_UTMPX_UT_SYSLEN)
utent->ut_syslen = MIN(strlen(hostname),
sizeof(utent->ut_host));
Expand Down
Loading