tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/08/22 19:38:42 

[clientloop.c]
     format with current EscapeChar; bugzilla #388 from wknox@mitre.org.
     ok markus@
This commit is contained in:
Damien Miller 2002-09-04 16:32:10 +10:00
parent 58f3486c74
commit 066928648b
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -16,6 +16,10 @@
- stevesk@cvs.openbsd.org 2002/08/22 19:27:53 - stevesk@cvs.openbsd.org 2002/08/22 19:27:53
[ssh-agent.c] [ssh-agent.c]
use common close function; ok markus@ 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 20020820
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -1557,4 +1561,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

22
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -635,16 +635,18 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
snprintf(string, sizeof string, snprintf(string, sizeof string,
"%c?\r\n\ "%c?\r\n\
Supported escape sequences:\r\n\ Supported escape sequences:\r\n\
~. - terminate connection\r\n\ %c. - terminate connection\r\n\
~C - open a command line\r\n\ %cC - open a command line\r\n\
~R - Request rekey (SSH protocol 2 only)\r\n\ %cR - Request rekey (SSH protocol 2 only)\r\n\
~^Z - suspend ssh\r\n\ %c^Z - suspend ssh\r\n\
~# - list forwarded connections\r\n\ %c# - list forwarded connections\r\n\
~& - background ssh (when waiting for connections to terminate)\r\n\ %c& - background ssh (when waiting for connections to terminate)\r\n\
~? - this message\r\n\ %c? - this message\r\n\
~~ - send the escape character by typing it twice\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", (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)); buffer_append(berr, string, strlen(string));
continue; continue;