? etc/sendmail/daintree.mc
Index: crypto/telnet/telnet/main.c
===================================================================
RCS file: /home/ncvs/src/crypto/telnet/telnet/main.c,v
retrieving revision 1.13
diff -u -r1.13 main.c
--- crypto/telnet/telnet/main.c	2001/08/20 12:28:40	1.13
+++ crypto/telnet/telnet/main.c	2001/08/21 20:37:41
@@ -107,10 +107,10 @@
 	fprintf(stderr, "Usage: %s %s%s%s%s\n",
 	    prompt,
 #ifdef	AUTHENTICATION
-	    "[-4] [-6] [-8] [-E] [-K] [-L] [-N] [-S tos] [-X atype] [-c] [-d]",
+	    "[-4] [-6] [-8] [-E] [-K] [-L] [-N] [-S tos] [-X atype] [-a] [-c] [-d]",
 	    "\n\t[-e char] [-k realm] [-l user] [-f/-F] [-n tracefile] ",
 #else
-	    "[-4] [-6] [-8] [-E] [-L] [-N] [-S tos] [-c] [-d]",
+	    "[-4] [-6] [-8] [-E] [-L] [-N] [-S tos] [-a] [-c] [-d]",
 	    "\n\t[-e char] [-l user] [-n tracefile] ",
 #endif
 #if defined(TN3270) && defined(unix)
@@ -163,8 +163,12 @@
 
 	rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
 #ifdef AUTHENTICATION
+#ifdef TELNET_AUTOLOGIN
 	autologin = 1;
 #else
+	autologin = 0;
+#endif
+#else
 	autologin = -1;
 #endif
 
@@ -198,9 +202,7 @@
 			rlogin = escape = _POSIX_VDISABLE;
 			break;
 		case 'K':
-#ifdef	AUTHENTICATION
 			autologin = 0;
-#endif
 			break;
 		case 'L':
 			eight |= 2;	/* binary output only */
@@ -231,11 +233,7 @@
 #endif
 			break;
 		case 'a':
-#ifdef	AUTHENTICATION
-			/* It's the default now, so ignore */
-#else
 			autologin = 1;
-#endif
 			break;
 		case 'c':
 			skiprc = 1;
@@ -291,11 +289,7 @@
 #endif
 			break;
 		case 'l':
-#ifdef	AUTHENTICATION
-			/* This is the default now, so ignore it */
-#else
 			autologin = 1;
-#endif
 			user = optarg;
 			break;
 		case 'n':
Index: crypto/telnet/telnet/telnet.1
===================================================================
RCS file: /home/ncvs/src/crypto/telnet/telnet/telnet.1,v
retrieving revision 1.16
diff -u -r1.16 telnet.1
--- crypto/telnet/telnet/telnet.1	2001/08/20 12:28:40	1.16
+++ crypto/telnet/telnet/telnet.1	2001/08/21 20:37:41
@@ -120,7 +120,6 @@
 type of authentication.
 .It Fl a
 Attempt automatic login.
-This is now the default, so this option is ignored.
 Currently, this sends the user name via the
 .Ev USER
 variable
Index: secure/usr.bin/telnet/Makefile
===================================================================
RCS file: /home/ncvs/src/secure/usr.bin/telnet/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- secure/usr.bin/telnet/Makefile	2001/08/20 12:32:42	1.29
+++ secure/usr.bin/telnet/Makefile	2001/08/21 20:37:41
@@ -6,6 +6,11 @@
 		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
 		-I${TELNETDIR}
 
+.if defined(TELNET_AUTOLOGIN) && ${TELNET_AUTOLOGIN} != "no" && \
+    ${TELNET_AUTOLOGIN} != "NO"
+CFLAGS+=	-DTELNET_AUTOLOGIN
+.endif
+
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c
 
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.172
diff -u -r1.172 make.conf
--- etc/defaults/make.conf	2001/08/16 06:05:17	1.172
+++ etc/defaults/make.conf	2001/08/21 20:37:41
@@ -133,6 +133,9 @@
 # be OK to use for any non-commercial use.  This is optional.
 #MAKE_IDEA=	YES	# IDEA (128 bit symmetric encryption)
 #
+# Define this if you want telnet to attempt to auto-login (KRB, SRA, whatever)
+#TELNET_AUTOLOGIN=	YES
+#
 # To avoid running MAKEDEV all on /dev during install set NO_MAKEDEV_RUN.
 # If you don't want to install MAKEDEV set NO_MAKEDEV_INSTALL, this implies
 # NO_MAKEDEV_RUN.