Latest round of bug fixes. See the README file

[unix-history] / usr / src / libexec / telnetd / termstat.c

diff --git a/usr/src/libexec/telnetd/termstat.c b/usr/src/libexec/telnetd/termstat.c
index 962f966..e9add20 100644 (file)
--- a/usr/src/libexec/telnetd/termstat.c
+++ b/usr/src/libexec/telnetd/termstat.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)termstat.c 5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)termstat.c 5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "telnetd.h"
 #endif /* not lint */
 
 #include "telnetd.h"


@@ -168,10 +168,12 @@ localstat()
         * not send anything if it is unnecessary, so don't worry
         * about that here.
         */
         * not send anything if it is unnecessary, so don't worry
         * about that here.
         */

-       if (tty_isecho() && uselinemode)
-               send_wont(TELOPT_ECHO, 1);
-       else
-               send_will(TELOPT_ECHO, 1);
+       if (uselinemode) {
+               if (tty_isecho())
+                       send_wont(TELOPT_ECHO, 1);
+               else
+                       send_will(TELOPT_ECHO, 1);
+       }

 
        /*
         * If linemode is being turned off, send appropriate
 
        /*
         * If linemode is being turned off, send appropriate


@@ -248,7 +250,7 @@ localstat()
                goto done;
 # endif        /* KLUDGELINEMODE */
 
                goto done;
 # endif        /* KLUDGELINEMODE */
 

-       if (linemode) {
+       if (linemode && his_state_is_will(TELOPT_LINEMODE)) {

                /*
                 * If edit mode changed, send edit mode.
                 */
                /*
                 * If edit mode changed, send edit mode.
                 */