Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/utmp.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/utmp.c (modified) (7 diffs)

branches/3.3/mindi-busybox/libbb/utmp.c

@@ -17 +17 @@
 void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
 {
-    struct utmp utent;
+    struct utmpx utent;
     char *id;
     unsigned width;
@@ -46 +46 @@
     strncpy(id, tty_name, width);
 
-    touch(_PATH_UTMP);
-    //utmpname(_PATH_UTMP);
-    setutent();
+    touch(_PATH_UTMPX);
+    //utmpxname(_PATH_UTMPX);
+    setutxent();
     /* Append new one (hopefully, unless we collide on ut_id) */
-    pututline(&utent);
-    endutent();
+    pututxline(&utent);
+    endutxent();
 
 #if ENABLE_FEATURE_WTMP
     /* "man utmp" says wtmp file should *not* be created automagically */
     /*touch(bb_path_wtmp_file);*/
-    updwtmp(bb_path_wtmp_file, &utent);
+    updwtmpx(bb_path_wtmp_file, &utent);
 #endif
 }
@@ -65 +65 @@
 void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
 {
-    struct utmp utent;
-    struct utmp *utp;
+    struct utmpx utent;
+    struct utmpx *utp;
 
-    touch(_PATH_UTMP);
-    //utmpname(_PATH_UTMP);
-    setutent();
+    touch(_PATH_UTMPX);
+    //utmpxname(_PATH_UTMPX);
+    setutxent();
 
     /* Did init/getty/telnetd/sshd/... create an entry for us?
      * It should be (new_type-1), but we'd also reuse
      * any other potentially stale xxx_PROCESS entry */
-    while ((utp = getutent()) != NULL) {
+    while ((utp = getutxent()) != NULL) {
         if (utp->ut_pid == pid
         // && ut->ut_line[0]
@@ -89 +89 @@
                 memset(utp->ut_host, 0, sizeof(utp->ut_host));
             }
-            /* NB: pututline (see later) searches for matching utent
-             * using getutid(utent) - we must not change ut_id
+            /* NB: pututxline (see later) searches for matching utxent
+             * using getutxid(utent) - we must not change ut_id
              * if we want *exactly this* record to be overwritten!
              */
@@ -96 +96 @@
         }
     }
-    //endutent(); - no need, pututline can deal with (and actually likes)
+    //endutxent(); - no need, pututxline can deal with (and actually likes)
     //the situation when utmp file is positioned on found record
 
@@ -103 +103 @@
             write_new_utmp(pid, new_type, tty_name, username, hostname);
         else
-            endutent();
+            endutxent();
         return;
     }
 
-    /* Make a copy. We can't use *utp, pututline's internal getutid
+    /* Make a copy. We can't use *utp, pututxline's internal getutxid
      * will overwrite it before it is used! */
     utent = *utp;
@@ -121 +121 @@
 
     /* Update, or append new one */
-    //setutent();
-    pututline(&utent);
-    endutent();
+    //setutxent();
+    pututxline(&utent);
+    endutxent();
 
 #if ENABLE_FEATURE_WTMP
     /* "man utmp" says wtmp file should *not* be created automagically */
     /*touch(bb_path_wtmp_file);*/
-    updwtmp(bb_path_wtmp_file, &utent);
+    updwtmpx(bb_path_wtmp_file, &utent);
 #endif
 }
+
+/* man utmp:
+ * When init(8) finds that a process has exited, it locates its utmp entry
+ * by ut_pid, sets ut_type to DEAD_PROCESS, and clears ut_user, ut_host
+ * and ut_time with null bytes.
+ * [same applies to other processes which maintain utmp entries, like telnetd]
+ *
+ * We do not bother actually clearing fields:
+ * it might be interesting to know who was logged in and from where
+ */
+void FAST_FUNC update_utmp_DEAD_PROCESS(pid_t pid)
+{
+    update_utmp(pid, DEAD_PROCESS, NULL, NULL, NULL);
+}