Fix bug where turning off CRMOD causes clients which send

<CR><LF> to always see ^M (and, so line can't be terminated).

SCCS-vsn: libexec/telnetd/telnetd.c 5.22

diff --git a/usr/src/libexec/telnetd/telnetd.c b/usr/src/libexec/telnetd/telnetd.c
index 085ab58..a3f004c 100644 (file)
--- a/usr/src/libexec/telnetd/telnetd.c
+++ b/usr/src/libexec/telnetd/telnetd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)telnetd.c  5.21 (Berkeley) %G%";
+static char sccsid[] = "@(#)telnetd.c  5.22 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -932,7 +932,7 @@ int option;
 
     switch (option) {
     case TELOPT_ECHO:          /* we should stop echoing */
 
     switch (option) {
     case TELOPT_ECHO:          /* we should stop echoing */

-       mode(0, ECHO|CRMOD);
+       mode(0, ECHO);

        fmt = wont;
        break;
 
        fmt = wont;
        break;