Fix handling so that the username is only written out to wtmpx logout records;

I know of no systems that write out usernames in DEAD_PROCESS records
in wtmp, but can special case them in update_wtmp if they are found.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7323 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/pty/logwtmp.c b/src/util/pty/logwtmp.c
index 89feabb81a8e1889f002a8af777a79754612d282..4fbac3427a9adafdb7d100bfa2dc6ca20253c54f 100644 (file)
--- a/src/util/pty/logwtmp.c
+++ b/src/util/pty/logwtmp.c
@@ -56,7 +56,7 @@ long pty_logwtmp (tty, user, host )
     strncpy(ut.ut_name, user, sizeof(ut.ut_name));
 #endif
 
-    return ptyint_update_wtmp(&ut, host);
+    return ptyint_update_wtmp(&ut, host, user);
 #endif /*HAVE_LOGWTMP*/
 }
 

diff --git a/src/util/pty/pty-int.h b/src/util/pty/pty-int.h
index 1b59275c594c2bea1f861507bde20e6addda9023..489072654bf4069c9a75b9a41273109ff6c90e70 100644 (file)
--- a/src/util/pty/pty-int.h
+++ b/src/util/pty/pty-int.h
@@ -94,7 +94,7 @@
 void initialize_pty_error_table(void);
 long ptyint_void_association(void);
 long ptyint_open_ctty (char *slave, int *fd);
-long ptyint_update_wtmp (struct utmp *ut, char *host);
+long ptyint_update_wtmp (struct utmp *ut, char *host, char *user);
 
 void ptyint_vhangup(void);
 #else /*__STDC__*/

diff --git a/src/util/pty/update_wtmp.c b/src/util/pty/update_wtmp.c
index 4666b44cc76ce064df0b2d3fa3198827d0089ef3..0bda4dbaca2639870811895a1908c1bd283ec409 100644 (file)
--- a/src/util/pty/update_wtmp.c
+++ b/src/util/pty/update_wtmp.c
@@ -32,9 +32,10 @@
 #endif
 
 
-long ptyint_update_wtmp (ent , host)
+long ptyint_update_wtmp (ent , host, user)
     struct utmp *ent;
      char *host;
+char *user;
     {
     struct utmp ut;
     struct stat statb;
@@ -45,7 +46,9 @@ long ptyint_update_wtmp (ent , host)
     getutmpx(ent, &utx);
 if (host)
     strncpy(utx.ut_host, host, sizeof(utx.ut_host) );
-    else utx.ut_host[0] = 0;
+else utx.ut_host[0] = 0;
+if (user)
+    strncpy(utx.ut_user, user, sizeof(utx.ut_user));
     updwtmpx(WTMPX_FILE, &utx);
 #endif