From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 1 May 2001 22:39:38 +0000 (+0000)
Subject: * telnet.c (telnet): Fix grammar in some error messages
X-Git-Tag: krb5-1.3-alpha1~1527
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=232092b38cb95fe14db823f51ccd795285a0a372;p=krb5.git

* telnet.c (telnet): Fix grammar in some error messages

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13224 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 86f106418..6cfdcaf39 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-01  Ken Raeburn  <raeburn@mit.edu>
+
+	* telnet.c (telnet): Fix grammar in some error messages.  Based on
+	a patch from Garry Zacheiss.
+
 2000-12-06  Ken Raeburn  <raeburn@mit.edu>
 
 	* commands.c (tn): Local var "user" should be volatile.
diff --git a/src/appl/telnet/telnet/telnet.c b/src/appl/telnet/telnet/telnet.c
index 8db744b7f..75d78b481 100644
--- a/src/appl/telnet/telnet/telnet.c
+++ b/src/appl/telnet/telnet/telnet.c
@@ -2313,23 +2313,23 @@ telnet(user)
 	while (1) {
 	    if (my_want_state_is_wont(TELOPT_AUTHENTICATION)) {
 		printf("\nServer refused to negotiate authentication, which is required\n");
-		printf("for encryption.  Good bye.\n\r");
+		printf("for encryption.  Good-bye.\n\r");
 		Exit(1);
 	    }
 	    if (auth_has_failed) {
-		printf("\nAuthentication negotation has failed, which is required for\n");
-		printf("encryption.  Good bye.\n\r");
+		printf("\nNegotiation of authentication, which is required for encryption,\n");
+		printf("has failed.  Good-bye.\n\r");
 		Exit(1);
 	    }
 	    if (my_want_state_is_dont(TELOPT_ENCRYPT) ||
 		my_want_state_is_wont(TELOPT_ENCRYPT)) {
-		printf("\nServer refused to negotiate encryption.  Good bye.\n\r");
+		printf("\nServer refused to negotiate encryption.  Good-bye.\n\r");
 		Exit(1);
 	    }
 	    if (encrypt_is_encrypting())
 		break;
 	    if (time(0) > timeout) {
-		printf("\nEncryption could not be enabled.  Goodbye.\n\r");
+		printf("\nEncryption could not be enabled.  Good-bye.\n\r");
 		Exit(1);
 	    }
 	    if (printed_encrypt == 0) {
@@ -2343,7 +2343,7 @@ telnet(user)
 		    intr_waiting = 1;
 	    }
 	    if (intr_happened) {
-		    printf("\nUser requested an interrupt.  Goodbye.\n\r");
+		    printf("\nUser requested an interrupt.  Good-bye.\n\r");
 		    Exit(1);
 	    }
 	    telnet_spin();