1 files changed, 4 insertions, 39 deletions

diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 002dc3fe6f43..c0c82eef6791 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
+#	$Id$
 
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
@@ -12,52 +13,16 @@ SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 DPADD=	${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP}
 LDADD=	-L${TELNETOBJDIR} -lutil -ltermcap -ltelnet
 
-CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
-CFLAGS+=-I${.CURDIR}/../../lib
+CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
+CFLAGS+= -DENCRYPTION -I${.CURDIR}/../../lib
 
-#ifdef	ENCRYPTION
-
-CFLAGS += -DENCRYPTION
-
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
-	|| defined(MAKE_KERBEROS))
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES))
 CFLAGS+=-DAUTHENTICATION
 LDADD+= -ldes -lkrb
 DPADD+= ${LIBDES} ${LIBKRB}
 .endif
 
-#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
-#        || defined(MAKE_KERBEROS))
-#CFLAGS+=-DAUTHENTICATION
-#LDADD+= -ldes -lkrb5
-#DPADD+= ${LIBDES}
-#.endif
-
 # Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
 #LDADD+= -ldescrypt
 
-#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
-
 .include <bsd.prog.mk>
-
-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 */