From 2b1f71baeec8c1545885dc3ec5e3ac7d96319853 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 5 Jun 2001 20:32:21 +0000 Subject: - stevesk@cvs.openbsd.org 2001/05/24 18:57:53 [clientloop.c readconf.c ssh.c ssh.h] don't perform escape processing when ``EscapeChar none''; ok markus@ --- ssh.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ssh.c') diff --git a/ssh.c b/ssh.c index c2932582f..e1024d63c 100644 --- a/ssh.c +++ b/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.118 2001/05/04 23:47:34 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.119 2001/05/24 18:57:53 stevesk Exp $"); #include #include @@ -422,7 +422,7 @@ main(int ac, char **av) else if (strlen(optarg) == 1) options.escape_char = (u_char) optarg[0]; else if (strcmp(optarg, "none") == 0) - options.escape_char = -2; + options.escape_char = SSH_ESCAPECHAR_NONE; else { fprintf(stderr, "Bad escape character '%s'.\n", optarg); exit(1); @@ -961,7 +961,8 @@ ssh_session(void) } /* Enter the interactive session. */ - return client_loop(have_tty, tty_flag ? options.escape_char : -1, 0); + return client_loop(have_tty, tty_flag ? + options.escape_char : SSH_ESCAPECHAR_NONE, 0); } void @@ -1117,7 +1118,8 @@ ssh_session2(void) if (daemon(1, 1) < 0) fatal("daemon() failed: %.200s", strerror(errno)); - return client_loop(tty_flag, tty_flag ? options.escape_char : -1, id); + return client_loop(tty_flag, tty_flag ? + options.escape_char : SSH_ESCAPECHAR_NONE, id); } void -- cgit v1.2.3