From 066928648b11cc1ee02aca138853f17b3b6cf2f6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 4 Sep 2002 16:32:10 +1000 Subject: - stevesk@cvs.openbsd.org 2002/08/22 19:38:42 [clientloop.c] format with current EscapeChar; bugzilla #388 from wknox@mitre.org. ok markus@ --- ChangeLog | 6 +++++- clientloop.c | 22 ++++++++++++---------- 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 @@ - stevesk@cvs.openbsd.org 2002/08/22 19:27:53 [ssh-agent.c] use common close function; ok markus@ + - stevesk@cvs.openbsd.org 2002/08/22 19:38:42 + [clientloop.c] + format with current EscapeChar; bugzilla #388 from wknox@mitre.org. + ok markus@ 20020820 - OpenBSD CVS Sync @@ -1557,4 +1561,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2431 2002/09/04 06:31:21 djm Exp $ +$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 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.103 2002/06/30 21:59:45 deraadt Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.104 2002/08/22 19:38:42 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -635,16 +635,18 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) snprintf(string, sizeof string, "%c?\r\n\ Supported escape sequences:\r\n\ -~. - terminate connection\r\n\ -~C - open a command line\r\n\ -~R - Request rekey (SSH protocol 2 only)\r\n\ -~^Z - suspend ssh\r\n\ -~# - list forwarded connections\r\n\ -~& - background ssh (when waiting for connections to terminate)\r\n\ -~? - this message\r\n\ -~~ - send the escape character by typing it twice\r\n\ +%c. - terminate connection\r\n\ +%cC - open a command line\r\n\ +%cR - Request rekey (SSH protocol 2 only)\r\n\ +%c^Z - suspend ssh\r\n\ +%c# - list forwarded connections\r\n\ +%c& - background ssh (when waiting for connections to terminate)\r\n\ +%c? - this message\r\n\ +%c%c - send the escape character by typing it twice\r\n\ (Note that escapes are only recognized immediately after newline.)\r\n", - escape_char); + escape_char, escape_char, escape_char, escape_char, + escape_char, escape_char, escape_char, escape_char, + escape_char, escape_char); buffer_append(berr, string, strlen(string)); continue; -- cgit v1.2.3