aboutsummaryrefslogtreecommitdiff
path: root/secure/usr.bin/telnet
diff options
context:
space:
mode:
Diffstat (limited to 'secure/usr.bin/telnet')
-rw-r--r--secure/usr.bin/telnet/Makefile9
-rw-r--r--secure/usr.bin/telnet/main.c4
2 files changed, 12 insertions, 1 deletions
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 87ee4cf6c60f..0a3fdc0c5c26 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -31,7 +31,7 @@
# SUCH DAMAGE.
#
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id$
+# $Id: Makefile,v 1.13 1996/03/11 16:17:58 markm Exp $
#
PROG= telnet
@@ -53,4 +53,11 @@ DPADD+= ${LIBDES} ${LIBKRB}
# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt
+.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>
diff --git a/secure/usr.bin/telnet/main.c b/secure/usr.bin/telnet/main.c
index 09ac26c38caf..08cb57846848 100644
--- a/secure/usr.bin/telnet/main.c
+++ b/secure/usr.bin/telnet/main.c
@@ -122,6 +122,10 @@ 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 */