diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.118 2001/05/04 23:47:34 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.119 2001/05/24 18:57:53 stevesk Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -422,7 +422,7 @@ main(int ac, char **av) | |||
422 | else if (strlen(optarg) == 1) | 422 | else if (strlen(optarg) == 1) |
423 | options.escape_char = (u_char) optarg[0]; | 423 | options.escape_char = (u_char) optarg[0]; |
424 | else if (strcmp(optarg, "none") == 0) | 424 | else if (strcmp(optarg, "none") == 0) |
425 | options.escape_char = -2; | 425 | options.escape_char = SSH_ESCAPECHAR_NONE; |
426 | else { | 426 | else { |
427 | fprintf(stderr, "Bad escape character '%s'.\n", optarg); | 427 | fprintf(stderr, "Bad escape character '%s'.\n", optarg); |
428 | exit(1); | 428 | exit(1); |
@@ -961,7 +961,8 @@ ssh_session(void) | |||
961 | } | 961 | } |
962 | 962 | ||
963 | /* Enter the interactive session. */ | 963 | /* Enter the interactive session. */ |
964 | return client_loop(have_tty, tty_flag ? options.escape_char : -1, 0); | 964 | return client_loop(have_tty, tty_flag ? |
965 | options.escape_char : SSH_ESCAPECHAR_NONE, 0); | ||
965 | } | 966 | } |
966 | 967 | ||
967 | void | 968 | void |
@@ -1117,7 +1118,8 @@ ssh_session2(void) | |||
1117 | if (daemon(1, 1) < 0) | 1118 | if (daemon(1, 1) < 0) |
1118 | fatal("daemon() failed: %.200s", strerror(errno)); | 1119 | fatal("daemon() failed: %.200s", strerror(errno)); |
1119 | 1120 | ||
1120 | return client_loop(tty_flag, tty_flag ? options.escape_char : -1, id); | 1121 | return client_loop(tty_flag, tty_flag ? |
1122 | options.escape_char : SSH_ESCAPECHAR_NONE, id); | ||
1121 | } | 1123 | } |
1122 | 1124 | ||
1123 | void | 1125 | void |