diff options
| author | Hans Insulander <hin@cvs.openbsd.org> | 2002-03-22 13:49:29 +0000 |
|---|---|---|
| committer | Hans Insulander <hin@cvs.openbsd.org> | 2002-03-22 13:49:29 +0000 |
| commit | 4202aec9f4c7a04f46877a2707245f830aa01692 (patch) | |
| tree | 4df04dd6abfd5ec78204c1dea9e7000b6accd8e3 /usr.bin/telnet/main.c | |
| parent | 472456049e5d598acd2f5fc39cecf6a177ba83b8 (diff) | |
Telnet encryption warning messages, taken from kth-krb4-1.1.1.
(krb4-1.1.1 will be imported after release)
Noone bothered to look at this, but I've used this for a couple of weeks,
and i really want this to go in before release.
Diffstat (limited to 'usr.bin/telnet/main.c')
| -rw-r--r-- | usr.bin/telnet/main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index 78237353a55..6f8833eaa9a 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -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 @@ krb5_init(void) "libdefaults", "encrypt", NULL)) { encrypt_auto(1); decrypt_auto(1); + wantencryption = 1; EncryptVerbose(1); } #endif @@ -337,6 +338,7 @@ main(argc, argv) #ifdef ENCRYPTION encrypt_auto(1); decrypt_auto(1); + wantencryption = 1; EncryptVerbose(1); #else fprintf(stderr, @@ -353,15 +355,15 @@ main(argc, argv) 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; |