head	1.16;
access;
symbols
	RELENG_2_2_8_RELEASE:1.13.2.1
	RELENG_2_2_7_RELEASE:1.13.2.1
	RELENG_2_2_6_RELEASE:1.13.2.1
	RELENG_2_2_5_RELEASE:1.13
	RELENG_2_2_2_RELEASE:1.13
	RELENG_2_2_1_RELEASE:1.13
	RELENG_2_2_0_RELEASE:1.13
	RELENG_2_2:1.13.0.2
	RELENG_2_2_BP:1.13
	BSD4_4Lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.16
date	97.10.03.09.49.13;	author markm;	state dead;
branches;
next	1.15;

1.15
date	97.02.22.14.38.14;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	97.01.14.05.42.18;	author jkh;	state Exp;
branches;
next	1.13;

1.13
date	96.03.11.16.17.53;	author markm;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	96.03.09.13.39.00;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	95.10.11.00.04.05;	author gibbs;	state Exp;
branches;
next	1.10;

1.10
date	95.09.16.03.04.05;	author gibbs;	state Exp;
branches;
next	1.9;

1.9
date	95.09.14.21.29.15;	author gibbs;	state Exp;
branches;
next	1.8;

1.8
date	95.08.28.17.55.05;	author pst;	state Exp;
branches;
next	1.7;

1.7
date	95.08.05.19.10.24;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	95.07.24.22.55.51;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	95.07.24.21.59.48;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	95.07.24.21.46.33;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	95.07.20.11.39.33;	author pst;	state Exp;
branches;
next	1.2;

1.2
date	94.09.11.21.53.28;	author rgrimes;	state Exp;
branches
	1.2.6.1;
next	1.1;

1.1
date	94.08.12.22.53.44;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.08.12.22.53.45;	author csgr;	state Exp;
branches;
next	;

1.2.6.1
date	95.09.15.18.19.01;	author gibbs;	state Exp;
branches;
next	1.2.6.2;

1.2.6.2
date	95.09.16.03.13.33;	author gibbs;	state Exp;
branches;
next	1.2.6.3;

1.2.6.3
date	95.10.11.00.12.14;	author gibbs;	state Exp;
branches;
next	1.2.6.4;

1.2.6.4
date	95.10.29.06.55.01;	author davidg;	state Exp;
branches;
next	1.2.6.5;

1.2.6.5
date	96.06.21.17.29.06;	author markm;	state Exp;
branches;
next	1.2.6.6;

1.2.6.6
date	96.06.30.12.50.55;	author markm;	state Exp;
branches;
next	;

1.13.2.1
date	98.02.18.13.21.49;	author markm;	state dead;
branches;
next	;


desc
@@


1.16
log
@*GULP* Punt this into the attic. It is no longer used.
@
text
@#	@@(#)Makefile	8.2 (Berkeley) 12/15/93
#	$Id: Makefile,v 1.15 1997/02/22 14:38:14 peter Exp $

# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.

PROG=	telnetd
MAN8=	telnetd.8

SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
	termstat.c utility.c

DPADD=	${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP}
LDADD=	-L${TELNETOBJDIR} -lutil -ltermcap -ltelnet

CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
CFLAGS+= -DENCRYPTION -I${.CURDIR}/../../lib

.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES))
CFLAGS+=-DAUTHENTICATION
LDADD+= -ldes -lkrb
DPADD+= ${LIBDES} ${LIBKRB}
.endif

# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt

.include <bsd.prog.mk>
@


1.15
log
@Revert $FreeBSD$ to $Id$
@
text
@d2 1
a2 1
#	$Id$
@


1.14
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d2 1
a2 1
#	$FreeBSD$
@


1.13
log
@Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.
@
text
@d2 1
a2 1
#	$Id$
@


1.13.2.1
log
@Punt this into the attic. KerberosIV (KTH eBones) has been tagged into
the tree and the userland changes have been merged.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.13 1996/03/11 16:17:53 markm Exp $
@


1.12
log
@Sense MAKE_EBONES, DESTDIR
SRCS, DPADD cleanup
@
text
@d2 1
d16 2
a17 2
CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
CFLAGS+=-I${.CURDIR}/../../lib
d19 1
a19 6
#ifdef	ENCRYPTION

CFLAGS += -DENCRYPTION

.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
	|| defined(MAKE_KERBEROS))
a24 7
#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
#        || defined(MAKE_KERBEROS))
#CFLAGS+=-DAUTHENTICATION
#LDADD+= -ldes -lkrb5
#DPADD+= ${LIBDES}
#.endif

a27 7
#endif	/* ENCRYPTION */

# These are the sources that have encryption stuff in them.
CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c
CRYPT_SRC+= utility.c Makefile
NOCRYPT_DIR=${.CURDIR}/Nocrypt

a28 17

nocrypt:
#ifdef	ENCRYPTION
	@@for i in ${CRYPT_SRC}; do \
	    if [ ! -d ${NOCRYPT_DIR} ]; then \
		echo Creating subdirectory ${NOCRYPT_DIR}; \
		mkdir ${NOCRYPT_DIR}; \
	    fi; \
	    echo ${NOCRYPT_DIR}/$$i; \
	    unifdef -UENCRYPTION ${.CURDIR}/$$i | \
		sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
	done

placeholder:
#else	/* ENCRYPTION */
	@@echo "Encryption code already removed."
#endif	/* ENCRYPTION */
@


1.11
log
@Remove MAKE_EBONES conditionals.  They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
@
text
@d20 1
a20 1
CFLAGS+=-DAUTHENTICATION -DENCRYPTION
d22 3
a24 1
.if exists(/usr/lib/libkrb.a)
d26 1
d29 6
a34 3
.if exists(/usr/lib/libkrb5.a)
LDADD+= -ldes -lkrb5
.endif
@


1.10
log
@Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries.  This makes
secure reference the libraries that were just build instead of in /usr/lib.
@
text
@a21 1
.ifdef MAKE_EBONES
a23 1
.endif
@


1.9
log
@Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.
@
text
@d12 2
a13 2
DPADD=	${LIBUTIL} ${LIBTERMCAP}
LDADD=	-lutil -ltermcap -ltelnet
@


1.8
log
@Do NOT compile with -DKLUDGELINEMODE...hoses many telnet clients
@
text
@a2 4
# This stuff need original libdes to run (new_rnd_key.c module),
# current eBones/des lib don't have it
# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it

d22 1
a22 1
.ifdef MAKE_KERBEROS
@


1.7
log
@Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.
@
text
@d7 3
d11 2
a12 3
CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
CFLAGS+=-DOLD_ENVIRON -DENV_HACK
CFLAGS+=-I${.CURDIR}/../../lib
d15 1
d19 2
a20 1
MAN8=	telnetd.8
@


1.6
log
@Final cleanup pass through Makefiles, now this stuff
autodetect kerberos/eBones and work even with eBones,
but with reduced functionality (don't pick up des/krb stuff
in this case)
@
text
@d32 2
a33 1
LDADD+= -ldescrypt
@


1.5
log
@Add -ldescrypt, or wrong crypt version can be picked from libc
Reviewed by:
Submitted by:
Obtained from:
@
text
@a20 1
LDADD+= -ldescrypt
d24 2
a25 1
LDADD+=	-lkrb -ldes
d27 3
d31 2
@


1.4
log
@Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live
Reviewed by:
Submitted by:
Obtained from:
@
text
@d21 1
@


1.3
log
@Update telnet to the 95.05.31 release.

Obtained from:	Dave Borman <dab@@cray.com>
@
text
@d3 4
d22 1
d25 1
@


1.2
log
@Change all references to LIBTERM and -ltermlib to LIBTERMCAP and -ltermcap
@
text
@a6 1
#CFLAGS+=-DAUTHENTICATION -DENCRYPTION
d11 1
a11 1
#LDADD+=	-lkrb -ldes
d13 10
@


1.2.6.1
log
@Merge with HEAD.  Brings in new secure telnet suite + eBones fixes.
@
text
@a2 3
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.

d4 4
a7 2
MAN8=	telnetd.8

a9 1

d12 2
a13 22

CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
CFLAGS+=-I${.CURDIR}/../../lib

#ifdef	ENCRYPTION

CFLAGS+=-DAUTHENTICATION -DENCRYPTION

.ifdef MAKE_EBONES
.if exists(/usr/lib/libkrb.a)
LDADD+= -ldes -lkrb
.endif
.endif

.if exists(/usr/lib/libkrb5.a)
LDADD+= -ldes -lkrb5
.endif

# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt

#endif	/* ENCRYPTION */
@


1.2.6.2
log
@Merge with Head:
Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries.  This makes
secure reference the libraries that were just built instead of in /usr/lib.
@
text
@d12 2
a13 2
DPADD=	${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP}
LDADD=	-L${TELNETOBJDIR} -lutil -ltermcap -ltelnet
@


1.2.6.3
log
@Remove MAKE_EBONES conditionals.  Besides being wrong, this was what screwed
up secure telnet in the previous snapshots.
@
text
@d22 1
d25 1
@


1.2.6.4
log
@Put telnet, telnetd, and libtelnet in the krb distribution where they
belong. They should be actually moved in the source tree to be under
eBones, but I don't want to mess with that now. This should hopefully
fix the main problem people were having when they selected the "des"
distribution and not krb, but got the Kerberos version of telnet and
friends as a side effect.

Submitted by:	Justin Gibbs <gibbs>
@
text
@a7 1
DISTRIBUTION= krb
@


1.2.6.5
log
@Merge with HEAD
@
text
@a1 1
#	$Id$
d8 1
d16 2
a17 2
CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
CFLAGS+= -DENCRYPTION -I${.CURDIR}/../../lib
d19 5
a23 2
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES))
CFLAGS+=-DAUTHENTICATION
d25 4
a28 1
DPADD+= ${LIBDES} ${LIBKRB}
d34 7
d42 17
@


1.2.6.6
log
@Make telnet part of the krb distribution
@
text
@a6 2
DISTRIBUTION=	krb

@


1.1
log
@Initial revision
@
text
@d10 1
a10 1
DPADD=	${LIBUTIL} ${LIBTERM}
@


1.1.1.1
log
@Move the telnetd with encryption to src/secure
This needs tidying up and having makefiles sorted out later.
Reviewed by:	Geoff Rehmet
@
text
@@
