ip link: add VLAN support

[oweals/busybox.git] / networking / telnetd.c

diff --git a/networking/telnetd.c b/networking/telnetd.c
index 4404064fc7004f278a6b7e4e98d0ea9b5432a651..9e7a84cce200c2bfa2cf62d1493bed60cf1d2732 100644 (file)
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -26,7 +26,6 @@
 //usage:#define telnetd_full_usage "\n\n"
 //usage:       "Handle incoming telnet connections"
 //usage:       IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n"
-//usage:     "\nOptions:"
 //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"
@@ -126,6 +125,7 @@ remove_iacs(struct tsession *ts, int *pnum_totty)
                        /* We map \r\n ==> \r for pragmatic reasons.
                         * 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'))
                                ptr++;