[src/netbsd-1-5]: src/usr.bin/telnet Pull up revision 1.15 (requested by assar):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39df3b1c9e5d
branches:  netbsd-1-5
changeset: 490830:39df3b1c9e5d
user:      he <he%NetBSD.org@localhost>
date:      Sun Mar 11 21:23:57 2001 +0000

description:
Pull up revision 1.15 (requested by assar):
  Correct handling of encryption and decryption with Kerberos4.
  Fixes PR#12226.

diffstat:

 usr.bin/telnet/main.c |  19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 83e0c6fd0c55 -r 39df3b1c9e5d usr.bin/telnet/main.c
--- a/usr.bin/telnet/main.c     Sun Mar 11 21:21:24 2001 +0000
+++ b/usr.bin/telnet/main.c     Sun Mar 11 21:23:57 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.12.4.1 2000/06/22 07:09:06 thorpej Exp $    */
+/*     $NetBSD: main.c,v 1.12.4.2 2001/03/11 21:23:57 he Exp $ */
 
 /*
  * Copyright (c) 1988, 1990, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.12.4.1 2000/06/22 07:09:06 thorpej Exp $");
+__RCSID("$NetBSD: main.c,v 1.12.4.2 2001/03/11 21:23:57 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -269,7 +269,9 @@
 #endif
                        break;
                case 'l':
-                       autologin = 1;
+                       if(autologin == 0) {
+                               autologin = -1;
+                       }
                        user = optarg;
                        break;
                case 'n':
@@ -327,6 +329,17 @@
                        /* NOTREACHED */
                }
        }
+
+       if (autologin == -1) {          /* esc%magic.fi@localhost; force  */
+#if defined(AUTHENTICATION)
+               autologin = 1;
+#endif
+#if defined(ENCRYPTION)
+               encrypt_auto(1);
+               decrypt_auto(1);
+#endif
+       }
+
        if (autologin == -1)
                autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1;