- (djm) Replace ut_name with ut_user. Patch from Jim Watt

   <jimw@peisj.pebio.com>

diff --git a/ChangeLog b/ChangeLog
index ef8d9d7f5cf88b661ace870957bcd1527f1234e7..20831f2e336565bb03ff167382839f59dc780a5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    Problem report from Niklas Edmundsson <nikke@ing.umu.se>
  - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM 
    builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
+ - (djm) Replace ut_name with ut_user. Patch from Jim Watt
+   <jimw@peisj.pebio.com>
 
 20000708
  - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from 

diff --git a/loginrec.c b/loginrec.c
index 46d1c19061ae7e633a6d7e5f5912c345b92f4423..83d4b2b0c7c82d3dd5cf68c5fef9bae4de8ce094 100644 (file)
--- 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));
                }