Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/telnetd.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/networking/telnetd.c (modified) (5 diffs)

branches/3.3/mindi-busybox/networking/telnetd.c

@@ -45 +45 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 
@@ -83 +84 @@
     int maxfd;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     G.loginpath = "/bin/login"; \
     G.issuefile = "/etc/issue.net"; \
@@ -266 +268 @@
 
     /* SO_KEEPALIVE by popular demand */
-    setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
+    setsockopt_keepalive(sock);
 #if ENABLE_FEATURE_TELNETD_STANDALONE
     ts->sockfd_read = sock;
@@ -463 +465 @@
             if (ts->shell_pid == pid) {
                 ts->shell_pid = -1;
-// 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
-                update_utmp(pid, DEAD_PROCESS, /*tty_name:*/ NULL, /*username:*/ NULL, /*hostname:*/ NULL);
+                update_utmp_DEAD_PROCESS(pid);
                 break;
             }
@@ -740 +734 @@
  kill_session:
         if (ts->shell_pid > 0)
-            update_utmp(ts->shell_pid, DEAD_PROCESS, /*tty_name:*/ NULL, /*username:*/ NULL, /*hostname:*/ NULL);
+            update_utmp_DEAD_PROCESS(ts->shell_pid);
         free_session(ts);
         ts = next;