summaryrefslogtreecommitdiffstats
path: root/usr.bin/telnet
diff options
context:
space:
mode:
authorpst <pst@FreeBSD.org>1996-05-30 03:09:18 +0000
committerpst <pst@FreeBSD.org>1996-05-30 03:09:18 +0000
commit1f6cfc836246cbe366daaf25537ad13235d8c5b2 (patch)
treedca827c9e6ea7d6b1abeb5783ac733a30bc85fe4 /usr.bin/telnet
parent93cb831554dbe0e43e154dbf039bd862f4c3bafe (diff)
downloadFreeBSD-src-1f6cfc836246cbe366daaf25537ad13235d8c5b2.zip
FreeBSD-src-1f6cfc836246cbe366daaf25537ad13235d8c5b2.tar.gz
Remove obsolete SOCKSv4 support
Diffstat (limited to 'usr.bin/telnet')
-rw-r--r--usr.bin/telnet/Makefile9
-rw-r--r--usr.bin/telnet/main.c4
2 files changed, 1 insertions, 12 deletions
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 19222b4..fee9815 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 <bsd.prog.mk>
nocrypt:
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index f9d6455..896405c 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 */
OpenPOWER on IntegriCloud