d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring in a change that got lost when we spammed over the CVS repository

Browse Source 
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
This commit is contained in:
Nate Williams 1996-06-05 22:48:04 +00:00
parent 759b7d75fb
commit c4a4597e90
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=16150
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eBones/usr.bin/telnet/Makefile
View File

@ -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>

4
eBones/usr.bin/telnet/main.c
View File

@ -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 */

9
secure/usr.bin/telnet/Makefile
View File

@ -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>

4
secure/usr.bin/telnet/main.c
View File

@ -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 */