summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--clientloop.c22
2 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fa6fd0ab..2d6dc245d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 - stevesk@cvs.openbsd.org 2002/08/22 19:27:53 16 - stevesk@cvs.openbsd.org 2002/08/22 19:27:53
17 [ssh-agent.c] 17 [ssh-agent.c]
18 use common close function; ok markus@ 18 use common close function; ok markus@
19 - stevesk@cvs.openbsd.org 2002/08/22 19:38:42
20 [clientloop.c]
21 format with current EscapeChar; bugzilla #388 from wknox@mitre.org.
22 ok markus@
19 23
2020020820 2420020820
21 - OpenBSD CVS Sync 25 - OpenBSD CVS Sync
@@ -1557,4 +1561,4 @@
1557 - (stevesk) entropy.c: typo in debug message 1561 - (stevesk) entropy.c: typo in debug message
1558 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1562 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1559 1563
1560$Id: ChangeLog,v 1.2431 2002/09/04 06:31:21 djm Exp $ 1564$Id: ChangeLog,v 1.2432 2002/09/04 06:32:10 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index a3950ab68..2c030e71b 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.103 2002/06/30 21:59:45 deraadt Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.104 2002/08/22 19:38:42 stevesk Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
@@ -635,16 +635,18 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
635 snprintf(string, sizeof string, 635 snprintf(string, sizeof string,
636"%c?\r\n\ 636"%c?\r\n\
637Supported escape sequences:\r\n\ 637Supported escape sequences:\r\n\
638~. - terminate connection\r\n\ 638%c. - terminate connection\r\n\
639~C - open a command line\r\n\ 639%cC - open a command line\r\n\
640~R - Request rekey (SSH protocol 2 only)\r\n\ 640%cR - Request rekey (SSH protocol 2 only)\r\n\
641~^Z - suspend ssh\r\n\ 641%c^Z - suspend ssh\r\n\
642~# - list forwarded connections\r\n\ 642%c# - list forwarded connections\r\n\
643~& - background ssh (when waiting for connections to terminate)\r\n\ 643%c& - background ssh (when waiting for connections to terminate)\r\n\
644~? - this message\r\n\ 644%c? - this message\r\n\
645~~ - send the escape character by typing it twice\r\n\ 645%c%c - send the escape character by typing it twice\r\n\
646(Note that escapes are only recognized immediately after newline.)\r\n", 646(Note that escapes are only recognized immediately after newline.)\r\n",
647 escape_char); 647 escape_char, escape_char, escape_char, escape_char,
648 escape_char, escape_char, escape_char, escape_char,
649 escape_char, escape_char);
648 buffer_append(berr, string, strlen(string)); 650 buffer_append(berr, string, strlen(string));
649 continue; 651 continue;
650 652