Index: etc/defaults/make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.166
diff -u -r1.166 make.conf
--- etc/defaults/make.conf	2001/07/23 01:33:49	1.166
+++ etc/defaults/make.conf	2001/07/27 02:46:26
@@ -132,6 +132,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.
Index: crypto/telnet/telnet/main.c
===================================================================
RCS file: /home/ncvs/src/crypto/telnet/telnet/main.c,v
retrieving revision 1.12
diff -u -r1.12 main.c
--- crypto/telnet/telnet/main.c	2001/07/05 14:06:27	1.12
+++ crypto/telnet/telnet/main.c	2001/07/27 02:46:26
@@ -105,10 +105,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)
@@ -167,7 +167,11 @@
 	user = NULL;
 
 	rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
+#ifdef TELNET_AUTOLOGIN
 	autologin = 1;
+#else
+	autologin = 0;
+#endif
 
 #if defined(ENCRYPTION)
 	encrypt_auto(1);
@@ -232,7 +236,7 @@
 #endif
 			break;
 		case 'a':
-			/* It's the default now, so ignore */
+			autologin = 1;
 			break;
 		case 'c':
 			skiprc = 1;
Index: crypto/telnet/telnet/telnet.1
===================================================================
RCS file: /home/ncvs/src/crypto/telnet/telnet/telnet.1,v
retrieving revision 1.14
diff -u -r1.14 telnet.1
--- crypto/telnet/telnet/telnet.1	2001/07/10 10:35:52	1.14
+++ crypto/telnet/telnet/telnet.1	2001/07/27 02:46:26
@@ -42,7 +42,7 @@
 protocol
 .Sh SYNOPSIS
 .Nm
-.Op Fl 468EFKLNcdfruy
+.Op Fl 468EFKLNacdfruy
 .Op Fl S Ar tos
 .Op Fl X Ar authtype
 .Op Fl e Ar escapechar
@@ -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.26
diff -u -r1.26 Makefile
--- secure/usr.bin/telnet/Makefile	2001/05/09 14:30:49	1.26
+++ secure/usr.bin/telnet/Makefile	2001/07/27 02:46:26
@@ -6,6 +6,11 @@
                 -DENCRYPTION -DAUTHENTICATION -I${TELNETDIR}
 CFLAGS+=	-DIPSEC -DINET6
 
+.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