summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--clientloop.c3
-rw-r--r--ssh.163
3 files changed, 48 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 221526e67..3243d4da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120010421
2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2001/04/20 07:17:51
4 [clientloop.c ssh.1]
5 Split out and improve escape character documentation, mention ~R in
6 ~? help text; ok markus@
7
120010420 820010420
2 - OpenBSD CVS Sync 9 - OpenBSD CVS Sync
3 - ian@cvs.openbsd.org 2001/04/18 16:21:05 10 - ian@cvs.openbsd.org 2001/04/18 16:21:05
@@ -5187,4 +5194,4 @@
5187 - Wrote replacements for strlcpy and mkdtemp 5194 - Wrote replacements for strlcpy and mkdtemp
5188 - Released 1.0pre1 5195 - Released 1.0pre1
5189 5196
5190$Id: ChangeLog,v 1.1147 2001/04/20 04:59:22 mouring Exp $ 5197$Id: ChangeLog,v 1.1148 2001/04/20 12:50:51 mouring Exp $
diff --git a/clientloop.c b/clientloop.c
index 2709ce356..369ffe4ac 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.64 2001/04/17 09:52:48 markus Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.65 2001/04/20 07:17:51 djm Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
@@ -566,6 +566,7 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
566"%c?\r\n\ 566"%c?\r\n\
567Supported escape sequences:\r\n\ 567Supported escape sequences:\r\n\
568~. - terminate connection\r\n\ 568~. - terminate connection\r\n\
569~R - Request rekey (SSH protocol 2 only)\r\n\
569~^Z - suspend ssh\r\n\ 570~^Z - suspend ssh\r\n\
570~# - list forwarded connections\r\n\ 571~# - list forwarded connections\r\n\
571~& - background ssh (when waiting for connections to terminate)\r\n\ 572~& - background ssh (when waiting for connections to terminate)\r\n\
diff --git a/ssh.1 b/ssh.1
index 9e0298bd3..db894af9b 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.103 2001/04/17 10:53:26 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.104 2001/04/20 07:17:51 djm Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -243,30 +243,7 @@ All communication with
243the remote command or shell will be automatically encrypted. 243the remote command or shell will be automatically encrypted.
244.Pp 244.Pp
245If a pseudo-terminal has been allocated (normal login session), the 245If a pseudo-terminal has been allocated (normal login session), the
246user can disconnect with 246user may use the escape characters noted below.
247.Ic ~. ,
248and suspend
249.Nm
250with
251.Ic ~^Z .
252All forwarded connections can be listed with
253.Ic ~#
254and if
255the session blocks waiting for forwarded X11 or TCP/IP
256connections to terminate, it can be backgrounded with
257.Ic ~&
258(this should not be used while the user shell is active, as it can cause the
259shell to hang).
260All available escapes can be listed with
261.Ic ~? .
262.Pp
263A single tilde character can be sent as
264.Ic ~~
265(or by following the tilde by a character other than those described above).
266The escape character must always follow a newline to be interpreted as
267special.
268The escape character can be changed in configuration files
269or on the command line.
270.Pp 247.Pp
271If no pseudo tty has been allocated, the 248If no pseudo tty has been allocated, the
272session is transparent and can be used to reliably transfer binary 249session is transparent and can be used to reliably transfer binary
@@ -281,6 +258,42 @@ The exit status of the remote program is returned as the exit status
281of 258of
282.Nm ssh . 259.Nm ssh .
283.Pp 260.Pp
261.Ss Escape Characters
262.Pp
263When a pseudo terminal has been requested, ssh supports a number of functions
264through the use of an escape charater.
265.Pp
266A single tilde character can be sent as
267.Ic ~~
268(or by following the tilde by a character other than those described above).
269The escape character must always follow a newline to be interpreted as
270special.
271The escape character can be changed in configuration files using the
272.Cm EscapeChar
273configuration directive or on the command line by the
274.Fl e
275option.
276.Pp
277The supported escapes (assuming the default
278.Ql ~ )
279are:
280.Bl -tag -width Ds
281.It Cm ~.
282Disconnect
283.It Cm ~^Z
284Background ssh
285.It Cm ~#
286List forwarded connections
287.It Cm ~&
288Background ssh at logout when waiting for forwarded connection / X11 sessions
289to terminate (this does not currently work for SSH protocol version 2)
290.It Cm ~?
291Display a list of escape characters
292.It Cm ~R
293Request rekeying of connection (only useful for SSH protocol version 2 and if
294the peer supports it)
295.El
296.Pp
284.Ss X11 and TCP forwarding 297.Ss X11 and TCP forwarding
285.Pp 298.Pp
286If the user is using X11 (the 299If the user is using X11 (the