diff -cr ESRA-1.1/Config.generic ESRA-1.2/Config.generic *** ESRA-1.1/Config.generic Thu Apr 13 09:56:31 1995 --- ESRA-1.2/Config.generic Mon Jul 17 15:25:14 1995 *************** *** 195,202 **** # # OLD_ENVIRON Support for the old environment option. # ! # BIN_TERM Use always the terminal settings for binary mode. ! # Might be necessary for some chars (e.g. umlauts under X11). # LIB_OBJ= # This is a list of object files that are needed but are not in --- 195,202 ---- # # OLD_ENVIRON Support for the old environment option. # ! # BIN_TERM Use always the terminal settings for binary mode to make ! # the input of umlauts and other 8-bit characters possible. # LIB_OBJ= # This is a list of object files that are needed but are not in diff -cr ESRA-1.1/Config.generic ESRA-1.2/Config.genericESRA-1.1/Config.local ESRA-1.2/Config.local *** ESRA-1.1/Config.local Wed Apr 12 13:44:45 1995 --- ESRA-1.2/Config.local Mon Jul 17 15:46:08 1995 *************** *** 257,262 **** --- 257,263 ---- @echo "or setup a Config.local file for your system." @echo "Known system types are:" @echo + @echo " linux linux.auth linux.encrypt" @echo " 4.4bsd 4.3reno 4.4bsd.auth 4.3reno.auth 4.3tahoe 4.3bsd" @echo " bsdi1.0 bsdi1.0.auth" @echo " unicos8.1 unicos8.0 unicos7.C unicos7.0" *************** *** 273,278 **** --- 274,309 ---- @echo " next1.0" @echo " convex" + linux: + @make -f Makefile.generic ${WHAT} \ + LIBS="-ltermcap -ltelnet -L ../libtelnet ${AUTH_LIB}" \ + LIBPATH="/usr/lib/libtermcap.a ../libtelnet/libtelnet.a \ + ${AUTH_LIBPATH}" \ + DEST=${DESTDIR}/usr/bin \ + DEFINES="-DDIAGNOSTICS -DTERMCAP -DUSE_TERMIO -DKLUDGELINEMODE \ + -DDEFAULT_IM='\"\r\n\r\nLINUX (%h) (%t)\r\n\r\n\"' \ + -DBIN_TERM -DLINUX ${AUTH_DEF}" \ + INCLUDES="-I.. ${AUTH_INC}" \ + LIB_OBJ="getent.o" \ + LIB_SRC="getent.c" \ + AR=ar ARFLAGS=cq RANLIB=ranlib LORDER=NONE \ + LIBEXEC=${DESTDIR}/usr/sbin/in.telnetd \ + CC="gcc" LCCFLAGS="-O3" + + linux.auth: + @make -f ../Config.local `basename $@ .auth` WHAT=${WHAT} \ + AUTH_LIB="../libmp/libmp.a ${ENC_LIB}" \ + AUTH_LIBPATH="${ENC_LIBPATH}" \ + AUTH_INC="-I../libmp ${ENC_INC}" \ + AUTH_DEF="-DAUTHENTICATION -DSRA ${ENC_DEF}" + + linux.encrypt: + @make -f ../Config.local `basename $@ .encrypt`.auth WHAT=${WHAT} \ + ENC_LIB="../libdes/libdes.a" \ + ENC_LIBPATH="../libdes/libdes.a" \ + ENC_INC= \ + ENC_DEF="-DENCRYPT -DDES_ENCRYPTION" + 4.4bsd: make -f Makefile.generic ${WHAT} \ LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a" \ *************** *** 613,619 **** ../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \ DEST=${DESTDIR}/usr/ucb \ DEFINES=${ODEFS}"-DFILIO_H -DTERMCAP -DUSE_TERMIO \ ! -DKLUDGELINEMODE -DSTREAMS \ -DDEFAULT_IM='\"\r\nSunOS UNIX 4.1 (%h) (%t)\r\n\r\r\n\r\"' \ -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON ${AUTH_DEF}" \ INCLUDES="-I.. ${AUTH_INC}" \ --- 644,650 ---- ../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \ DEST=${DESTDIR}/usr/ucb \ DEFINES=${ODEFS}"-DFILIO_H -DTERMCAP -DUSE_TERMIO \ ! -DKLUDGELINEMODE -DSTREAMS -DBIN_TERM \ -DDEFAULT_IM='\"\r\nSunOS UNIX 4.1 (%h) (%t)\r\n\r\r\n\r\"' \ -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON ${AUTH_DEF}" \ INCLUDES="-I.. ${AUTH_INC}" \ *************** *** 624,630 **** CC="${CC}" LCCFLAGS="-O" sun4.1.auth: ! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \ AUTH_LIB="../libmp/libmp.a ${ENC_LIB}" \ AUTH_LIBPATH="${ENC_LIBPATH}" \ AUTH_INC=${ENC_INC} \ --- 655,661 ---- CC="${CC}" LCCFLAGS="-O" sun4.1.auth: ! make -f ../Config.local `basename $@ .auth` WHAT=${WHAT} \ AUTH_LIB="../libmp/libmp.a ${ENC_LIB}" \ AUTH_LIBPATH="${ENC_LIBPATH}" \ AUTH_INC=${ENC_INC} \ Common subdirectories: ESRA-1.1/arpa and ESRA-1.2/arpa Common subdirectories: ESRA-1.1/libtelnet and ESRA-1.2/libtelnet Common subdirectories: ESRA-1.1/telnet and ESRA-1.2/telnet Common subdirectories: ESRA-1.1/telnetd and ESRA-1.2/telnetd diff -cr ESRA-1.1/telnet/externs.h ESRA-1.2/telnet/externs.h *** ESRA-1.1/telnet/externs.h Thu Feb 9 13:06:24 1995 --- ESRA-1.2/telnet/externs.h Mon Jul 17 16:40:33 1995 *************** *** 64,70 **** # include #endif /* CRAY */ #ifdef USE_TERMIO ! # ifndef VINTR # ifdef SYSV_TERMIO # include # else --- 64,70 ---- # include #endif /* CRAY */ #ifdef USE_TERMIO ! # if !defined(VINTR) || defined(LINUX) # ifdef SYSV_TERMIO # include # else diff -cr ESRA-1.1/telnet/externs.h ESRA-1.2/telnet/externs.hESRA-1.1/telnet/sys_bsd.c ESRA-1.2/telnet/sys_bsd.c *** ESRA-1.1/telnet/sys_bsd.c Wed Apr 12 14:18:07 1995 --- ESRA-1.2/telnet/sys_bsd.c Mon Jul 17 15:25:29 1995 *************** *** 581,624 **** if (f == -1) { onoff = 0; } else { #ifndef USE_TERMIO - # ifndef BIN_TERM if (f & MODE_OUTBIN) - # endif lmode |= LLITOUT; - # ifndef BIN_TERM else lmode &= ~LLITOUT; - # endif - # ifndef BIN_TERM if (f & MODE_INBIN) - # endif lmode |= LPASS8; - # ifndef BIN_TERM else lmode &= ~LPASS8; - # endif #else - # ifndef BIN_TERM if (f & MODE_INBIN) - # endif tmp_tc.c_iflag &= ~ISTRIP; - # ifndef BIN_TERM else tmp_tc.c_iflag |= ISTRIP; if (f & MODE_OUTBIN) { - # endif tmp_tc.c_cflag &= ~(CSIZE|PARENB); tmp_tc.c_cflag |= CS8; tmp_tc.c_oflag &= ~OPOST; - # ifndef BIN_TERM } else { tmp_tc.c_cflag &= ~(CSIZE|PARENB); tmp_tc.c_cflag |= old_tc.c_cflag & (CSIZE|PARENB); tmp_tc.c_oflag |= OPOST; } - # endif #endif onoff = 1; } --- 581,618 ---- if (f == -1) { onoff = 0; } else { + #ifdef BIN_TERM + /* f = f & ~MODE_OUTBIN | MODE_INBIN; */ + f = MODE_INBIN; + /* + * this should enable umlauts and other 8-bit chars + * (adapt them to your local needs) + */ + #endif #ifndef USE_TERMIO if (f & MODE_OUTBIN) lmode |= LLITOUT; else lmode &= ~LLITOUT; if (f & MODE_INBIN) lmode |= LPASS8; else lmode &= ~LPASS8; #else if (f & MODE_INBIN) tmp_tc.c_iflag &= ~ISTRIP; else tmp_tc.c_iflag |= ISTRIP; if (f & MODE_OUTBIN) { tmp_tc.c_cflag &= ~(CSIZE|PARENB); tmp_tc.c_cflag |= CS8; tmp_tc.c_oflag &= ~OPOST; } else { tmp_tc.c_cflag &= ~(CSIZE|PARENB); tmp_tc.c_cflag |= old_tc.c_cflag & (CSIZE|PARENB); tmp_tc.c_oflag |= OPOST; } #endif onoff = 1; } diff -cr ESRA-1.1/telnetd/sys_term.c ESRA-1.2/telnetd/sys_term.c *** ESRA-1.1/telnetd/sys_term.c Wed Apr 12 14:04:52 1995 --- ESRA-1.2/telnetd/sys_term.c Mon Jul 17 15:30:50 1995 *************** *** 102,108 **** --- 102,112 ---- #include #include #endif + #ifdef LINUX + #include + #else #include + #endif #ifdef t_erase #undef t_erase #undef t_kill