From 5c081c155911e810f9595a8e1dfa66d0855e6d9c Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 7 Feb 2002 16:12:20 +0000 Subject: [PATCH] default to waiting for encryption if we are using authentication git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10820 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/telnet/telnet/main.c | 1 + appl/telnet/telnet/telnet.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c index f450c3ab9..e9c460277 100644 --- a/appl/telnet/telnet/main.c +++ b/appl/telnet/telnet/main.c @@ -329,6 +329,7 @@ main(int argc, char **argv) #if defined(ENCRYPTION) encrypt_auto(1); decrypt_auto(1); + wantencryption = -1; #endif } diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c index 0e3708846..9d22d8c81 100644 --- a/appl/telnet/telnet/telnet.c +++ b/appl/telnet/telnet/telnet.c @@ -2071,9 +2071,13 @@ my_telnet(char *user) send_will(TELOPT_ENCRYPT, 1); while (1) { if (my_want_state_is_wont(TELOPT_AUTHENTICATION)) { - printf("\nServer refused to negotiate authentication,\n"); - printf("which is required for encryption.\n"); - Exit(1); + if (wantencryption == -1) { + break; + } else { + printf("\nServer refused to negotiate authentication,\n"); + printf("which is required for encryption.\n"); + Exit(1); + } } if (auth_has_failed) { printf("\nAuthentication negotation has failed,\n");