Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/telnetd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/telnetd.c (modified) (5 diffs)

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

@@ -21 +21 @@
  * Set process group corrections, initial busybox port
  */
+
+//usage:#define telnetd_trivial_usage
+//usage:       "[OPTIONS]"
+//usage:#define telnetd_full_usage "\n\n"
+//usage:       "Handle incoming telnet connections"
+//usage:    IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n"
+//usage:     "\n    -l LOGIN    Exec LOGIN on connect"
+//usage:     "\n    -f ISSUE_FILE   Display ISSUE_FILE instead of /etc/issue"
+//usage:     "\n    -K      Close connection as soon as login exits"
+//usage:     "\n            (normally wait until all programs close slave pty)"
+//usage:    IF_FEATURE_TELNETD_STANDALONE(
+//usage:     "\n    -p PORT     Port to listen on"
+//usage:     "\n    -b ADDR[:PORT]  Address to bind to"
+//usage:     "\n    -F      Run in foreground"
+//usage:     "\n    -i      Inetd mode"
+//usage:    IF_FEATURE_TELNETD_INETD_WAIT(
+//usage:     "\n    -w SEC      Inetd 'wait' mode, linger time SEC"
+//usage:     "\n    -S      Log to syslog (implied by -i or without -F and -w)"
+//usage:    )
+//usage:    )
+
 #define DEBUG 0
 
@@ -31 +52 @@
 #endif
 #include <arpa/telnet.h>
-
-#if ENABLE_FEATURE_UTMP
-# include <utmp.h> /* LOGIN_PROCESS */
-#endif
 
 
@@ -109 +126 @@
              * Many client implementations send \r\n when
              * the user hits the CarriageReturn key.
+             * See RFC 1123 3.3.1 Telnet End-of-Line Convention.
              */
             if (c == '\r' && ptr < end && (*ptr == '\n' || *ptr == '\0'))
@@ -315 +333 @@
     bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
 
+    pid = getpid();
+
     if (ENABLE_FEATURE_UTMP) {
         len_and_sockaddr *lsa = get_peer_lsa(sock);
@@ -336 +356 @@
     xdup2(0, 1);
     xdup2(0, 2);
-    pid = getpid();
     tcsetpgrp(0, pid); /* switch this tty's process group to us */