From dd6ef4f0d26e57768acbd96fd7d8edd9b5ac09f1 Mon Sep 17 00:00:00 2001
From: Hasso Tepper <hasso@estpak.ee>
Date: Wed, 12 Aug 2009 12:45:51 +0300
Subject: [PATCH] Disable telnet autologin by default.

I doubt that anyone really uses it nowadayas, but it confuses a lot
a vendor "C" equipment making it to complain about missing kerberos
configuration.
---
 usr.bin/telnet/main.c   | 8 ++------
 usr.bin/telnet/telnet.1 | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index 55b37acb19..23df5a1a7e 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -135,7 +135,7 @@ main(int argc, char *argv[])
 
 	rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
 #ifdef AUTHENTICATION
-	autologin = 1;
+	autologin = 0;
 #else
 	autologin = -1;
 #endif
@@ -171,7 +171,7 @@ main(int argc, char *argv[])
 			break;
 		case 'K':
 #ifdef	AUTHENTICATION
-			autologin = 0;
+			/* It's the default now, so ignore */
 #endif
 			break;
 		case 'L':
@@ -203,11 +203,7 @@ main(int argc, char *argv[])
 #endif
 			break;
 		case 'a':
-#ifdef	AUTHENTICATION
-			/* It's the default now, so ignore */
-#else
 			autologin = 1;
-#endif
 			break;
 		case 'c':
 			skiprc = 1;
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 492b1c0d55..c6ae849621 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -33,7 +33,7 @@
 .\" $FreeBSD: src/crypto/telnet/telnet/telnet.1,v 1.4.2.9 2002/04/13 10:59:08 markm Exp $
 .\" $DragonFly: src/crypto/telnet/telnet/telnet.1,v 1.2 2003/06/17 04:24:37 dillon Exp $
 .\"
-.Dd January 27, 2000
+.Dd August 12, 2009
 .Dt TELNET 1
 .Os
 .Sh NAME
@@ -99,6 +99,7 @@ to the remote system, including any credentials that
 have already been forwarded into the local environment.
 .It Fl K
 Specifies no automatic login to the remote system.
+This is now the default, so this option is ignored.
 .It Fl L
 Specifies an 8-bit data path on output.  This causes the
 .Dv BINARY
-- 
2.41.0