TELNETD 'KLUDGELINEMODE' FIX

	If telnetd is compiled with the KLUDGELINEMODE option defined
something's going wrong when you're using tcsh, zsh, bash etc. and can't
use the SUSP and INTR characters.  Also whenever you do something which
outputs a couple of lines the newlines look messed up. i'm not really
sure what's the problem here (maybe something in raw-mode)? but at least
compiling it without the KLUDGELINEMODE works just beautifully.

AUTHOR:		Felix Gaehtgens (felix@escape.vsse.in-berlin.de)
386BSD-Patchkit: patch00035

diff --git a/usr/src/libexec/telnetd/Makefile b/usr/src/libexec/telnetd/Makefile
index 1500294..9de255f 100644 (file)
--- a/usr/src/libexec/telnetd/Makefile
+++ b/usr/src/libexec/telnetd/Makefile
@@ -1,7 +1,14 @@
 #      @(#)Makefile    5.16 (Berkeley) 5/13/91
 #      @(#)Makefile    5.16 (Berkeley) 5/13/91

-
+#
+# PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
+# --------------------         -----   ----------------------
+# CURRENT PATCH LEVEL:         1       00035
+# --------------------         -----   ----------------------
+#
+# 27 Nov 1992  Felix Gaehtgens         Removed KLUDGELINEMODE
+#

 PROG=  telnetd
 PROG=  telnetd

-CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
+CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS

 CFLAGS+=-I${.CURDIR}/../../lib
 SRCS=  global.c slc.c state.c sys_term.c telnetd.c \
        termstat.c utility.c
 CFLAGS+=-I${.CURDIR}/../../lib
 SRCS=  global.c slc.c state.c sys_term.c telnetd.c \
        termstat.c utility.c

diff --git a/usr/src/libexec/telnetd/state.c b/usr/src/libexec/telnetd/state.c
index e879b41..263b68c 100644 (file)
--- a/usr/src/libexec/telnetd/state.c
+++ b/usr/src/libexec/telnetd/state.c
@@ -29,6 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.

+ *
+ * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
+ * --------------------         -----   ----------------------
+ * CURRENT PATCH LEVEL:         1       00035
+ * --------------------         -----   ----------------------
+ *
+ * 27 Nov 1992 Felix Gaehtgens         Removed KLUDGELINEMODE
+ *

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -1035,7 +1043,7 @@ dontoption(option)
                                send_wont(option, 0);
                        set_my_state_wont(option);
                        if (turn_on_sga ^= 1)
                                send_wont(option, 0);
                        set_my_state_wont(option);
                        if (turn_on_sga ^= 1)

-                               send_will(option);
+                               send_will(option,1);

                        return;
 #endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */
 
                        return;
 #endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */