diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-05-24 18:57:54 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-05-24 18:57:54 +0000 |
| commit | 2b69e35d06300fff419628bd5f4d3ca67414e15d (patch) | |
| tree | 57d04a27f19cb114017a81e0bf6dcbeababe86a9 /usr.bin/ssh/ssh.c | |
| parent | b491fe3a15d9f949bba868e893624691d83aa815 (diff) | |
don't perform escape processing when ``EscapeChar none''; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 56d6b9613b7..4ff30bc0640 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 <openssl/evp.h> #include <openssl/err.h> @@ -409,7 +409,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); @@ -940,7 +940,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 @@ -1096,7 +1097,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 |