diff options
| author | nate <nate@FreeBSD.org> | 1996-06-05 22:48:04 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1996-06-05 22:48:04 +0000 |
| commit | 87afb7f371130825602b40da76985b693b40b2c3 (patch) | |
| tree | 8ccf8667397b018ad03a554d5cf2d5f267282214 /secure | |
| parent | 99c2eebb28f179cf7f98673935ba27d2a1dc9c23 (diff) | |
| download | FreeBSD-src-87afb7f371130825602b40da76985b693b40b2c3.zip FreeBSD-src-87afb7f371130825602b40da76985b693b40b2c3.tar.gz | |
Bring in a change that got lost when we spammed over the CVS repository
to fix the mega-commits spamming.
pst 96/05/29 20:09:25
Modified: secure/usr.bin/telnet Makefile main.c
Log:
Remove obsolete SOCKSv4 support
Submitted by: pst
Obtained from: A mirrored CVS repository that will disappear next SUP
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/usr.bin/telnet/Makefile | 9 | ||||
| -rw-r--r-- | secure/usr.bin/telnet/main.c | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 0a3fdc0..3369827 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: Makefile,v 1.13 1996/03/11 16:17:58 markm Exp $ +# $Id: Makefile,v 1.14 1996/04/23 05:18:42 pst Exp $ # PROG= telnet @@ -53,11 +53,4 @@ 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 08cb578..09ac26c 100644 --- a/secure/usr.bin/telnet/main.c +++ b/secure/usr.bin/telnet/main.c @@ -122,10 +122,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 */ |
