From abe67e41f682ea241e5affa7cd3d5c2c2891b74a Mon Sep 17 00:00:00 2001 From: Paul Traina Date: Thu, 30 May 1996 03:09:18 +0000 Subject: [PATCH] Remove obsolete SOCKSv4 support --- usr.bin/telnet/Makefile | 9 +-------- usr.bin/telnet/main.c | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 19222b44ab52..fee9815c16a0 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -42,7 +42,7 @@ CFLAGS+=-I${.CURDIR}/../../lib #CFLAGS+= -DKRB4 LDADD= -ltermcap -ltelnet -#LDADD+=-lkrb -ldes +#LDADD+= -lkrb -ldes DPADD= ${LIBTERMCAP} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ @@ -53,13 +53,6 @@ CRYPT_SRC= authenc.c commands.c externs.h main.c network.c CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile NOCRYPT_DIR=${.CURDIR}/Nocrypt -.if defined(SOCKS) -CFLAGS+=-DSOCKS -CFLAGS+=-Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dlisten=Rlisten \ - -Daccept=Raccept -Drcmd=Rrcmd -Dbind=Rbind -Dselect=Rselect -LDADD+= -lsocks -.endif - .include nocrypt: diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index f9d64550c762..896405cde7f9 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -118,10 +118,6 @@ main(argc, argv) extern int forward_flags; #endif /* FORWARD */ -#ifdef SOCKS - SOCKSinit(argv[0]); -#endif /* SOCKS */ - tninit(); /* Clear out things */ #if defined(CRAY) && !defined(__STDC__) _setlist_init(); /* Work around compiler bug */