===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/telnet/main.c	2001/11/03 00:07:53	1.12
+++ src/usr.bin/telnet/main.c	2002/03/22 13:49:28	1.13
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.12 2001/11/03 00:07:53 hin Exp $	*/
+/*	$OpenBSD: main.c,v 1.13 2002/03/22 13:49:28 hin Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $	*/
 
 /*
@@ -140,6 +140,7 @@
         "libdefaults", "encrypt", NULL)) {
           encrypt_auto(1);
           decrypt_auto(1); 
+	  wantencryption = 1;
           EncryptVerbose(1);
         }
 #endif
@@ -337,6 +338,7 @@
 #ifdef ENCRYPTION
 			encrypt_auto(1);
 			decrypt_auto(1);
+			wantencryption = 1;
 			EncryptVerbose(1);
 #else
 			fprintf(stderr,
@@ -353,15 +355,15 @@
 
 	if (autologin == -1) {
 #if defined(AUTHENTICATION)
-	    if(check_krb4_tickets() || check_krb5_tickets())
-		autologin = 1;
+		if(check_krb4_tickets() || check_krb5_tickets())
+			autologin = 1;
 #endif
 #if defined(ENCRYPTION)
 		encrypt_auto(1);
 		decrypt_auto(1);
 #endif
 	}
-	
+
 	if (autologin == -1)
 		autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1;