Fri Jun 21 00:27:51 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

[kopensolaris-gnu/glibc.git] / sysdeps / gnu / utmpbits.h

diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h
index e8c41f8..4749fdd 100644 (file)
--- a/sysdeps/gnu/utmpbits.h
+++ b/sysdeps/gnu/utmpbits.h
@@ -28,11 +28,6 @@ Boston, MA 02111-1307, USA.  */
 #define _PATH_WTMP     "/var/log/wtmp"
 #define _PATH_LASTLOG  "/var/log/lastlog"
 
-#define UTMP_FILE      _PATH_UTMP
-#define WTMP_FILE      _PATH_WTMP
-#define UTMP_FILENAME  UTMP_FILE
-#define WTMP_FILENAME  WTMP_FILE
-
 #define UT_UNKNOWN     0       /* for ut_type field */
 
 #define RUN_LVL                1
@@ -45,8 +40,6 @@ Boston, MA 02111-1307, USA.  */
 #define USER_PROCESS   7
 #define DEAD_PROCESS   8
 
-#define ut_name        ut_user
-
 #define UT_LINESIZE    32
 #define UT_NAMESIZE    32
 #define UT_HOSTSIZE    256
@@ -67,21 +60,23 @@ struct utmp
   char ut_line[UT_LINESIZE];   /* NUL-terminated devicename of tty.  */
   char ut_id[4];               /* Inittab id. */
   char ut_user[UT_NAMESIZE];   /* Username (not NUL terminated).  */
+#define ut_name        ut_user         /* Compatible field name for same.  */
   char ut_host[UT_HOSTSIZE];   /* Hostname for remote login.  */
   int ut_exit;                 /* Process termination/exit status.  */
-  struct timeval ut_tv;                /* Time entry was made.  */
   long ut_session;             /* Session ID, used for windowing.  */
+  struct timeval ut_tv;                /* Time entry was made.  */
   int32_t ut_addr;             /* Internet address of remote host.  */
   char pad[32];                        /* Reserved for future use.  */
 };
 
 #define ut_time        ut_tv.tv_sec    /* Backwards compatibility.  */
 
-/* Tell the user that we have a modern system with UT_TYPE, UT_ID
+/* Tell the user that we have a modern system with UT_HOST, UT_TYPE, UT_ID
    and UT_TV fields.  */
 #define _HAVE_UT_TYPE  1
 #define _HAVE_UT_ID    1
 #define _HAVE_UT_TV    1
+#define _HAVE_UT_HOST  1
 
 __END_DECLS