From 37f1df94bbf08bf7de98a9fa2f5d75a59fe7d20b Mon Sep 17 00:00:00 2001 From: djm Date: Sun, 9 Jul 2000 11:37:49 +0000 Subject: [PATCH] - (djm) Replace ut_name with ut_user. Patch from Jim Watt --- ChangeLog | 2 ++ loginrec.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef8d9d7f..20831f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Problem report from Niklas Edmundsson - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM builds. Problem report from Gregory Leblanc + - (djm) Replace ut_name with ut_user. Patch from Jim Watt + 20000708 - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from diff --git a/loginrec.c b/loginrec.c index 46d1c190..83d4b2b0 100644 --- a/loginrec.c +++ b/loginrec.c @@ -680,7 +680,7 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx) */ /* strncpy(): Don't necessarily want null termination */ - strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username)); + strncpy(utx->ut_user, li->username, MIN_SIZEOF(utx->ut_user, li->username)); # ifdef HAVE_HOST_IN_UTMPX strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname)); # endif @@ -740,12 +740,12 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) /* * Prevent luser from zero'ing out ut_host. * If the new ut_line is empty but the old one is not - * and ut_line and ut_name match, preserve the old ut_line. + * and ut_line and ut_user match, preserve the old ut_line. */ if (atomicio(read, fd, &old_ut, sizeof(old_ut)) == sizeof(old_ut) && (ut->ut_host[0] == '\0') && (old_ut.ut_host[0] != '\0') && (strncmp(old_ut.ut_line, ut->ut_line, sizeof(ut->ut_line)) == 0) && - (strncmp(old_ut.ut_name, ut->ut_name, sizeof(ut->ut_name)) == 0)) { + (strncmp(old_ut.ut_user, ut->ut_user, sizeof(ut->ut_user)) == 0)) { (void)memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host)); } -- 2.45.2