diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.233 2005/03/01 17:22:06 jmc Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.234 2005/03/10 22:01:06 deraadt Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -856,8 +856,8 @@ ssh_init_forwarding(void) | |||
856 | for (i = 0; i < options.num_local_forwards; i++) { | 856 | for (i = 0; i < options.num_local_forwards; i++) { |
857 | debug("Local connections to %.200s:%d forwarded to remote " | 857 | debug("Local connections to %.200s:%d forwarded to remote " |
858 | "address %.200s:%d", | 858 | "address %.200s:%d", |
859 | (options.local_forwards[i].listen_host == NULL) ? | 859 | (options.local_forwards[i].listen_host == NULL) ? |
860 | (options.gateway_ports ? "*" : "LOCALHOST") : | 860 | (options.gateway_ports ? "*" : "LOCALHOST") : |
861 | options.local_forwards[i].listen_host, | 861 | options.local_forwards[i].listen_host, |
862 | options.local_forwards[i].listen_port, | 862 | options.local_forwards[i].listen_port, |
863 | options.local_forwards[i].connect_host, | 863 | options.local_forwards[i].connect_host, |
@@ -876,6 +876,8 @@ ssh_init_forwarding(void) | |||
876 | for (i = 0; i < options.num_remote_forwards; i++) { | 876 | for (i = 0; i < options.num_remote_forwards; i++) { |
877 | debug("Remote connections from %.200s:%d forwarded to " | 877 | debug("Remote connections from %.200s:%d forwarded to " |
878 | "local address %.200s:%d", | 878 | "local address %.200s:%d", |
879 | (options.remote_forwards[i].listen_host == NULL) ? | ||
880 | (options.gateway_ports ? "*" : "LOCALHOST") : | ||
879 | options.remote_forwards[i].listen_host, | 881 | options.remote_forwards[i].listen_host, |
880 | options.remote_forwards[i].listen_port, | 882 | options.remote_forwards[i].listen_port, |
881 | options.remote_forwards[i].connect_host, | 883 | options.remote_forwards[i].connect_host, |
@@ -1093,7 +1095,7 @@ ssh_control_listener(void) | |||
1093 | old_umask = umask(0177); | 1095 | old_umask = umask(0177); |
1094 | if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { | 1096 | if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { |
1095 | control_fd = -1; | 1097 | control_fd = -1; |
1096 | if (errno == EINVAL) | 1098 | if (errno == EINVAL || errno == EADDRINUSE) |
1097 | fatal("ControlSocket %s already exists", | 1099 | fatal("ControlSocket %s already exists", |
1098 | options.control_path); | 1100 | options.control_path); |
1099 | else | 1101 | else |
@@ -1343,7 +1345,7 @@ control_client(const char *path) | |||
1343 | 1345 | ||
1344 | switch (mux_command) { | 1346 | switch (mux_command) { |
1345 | case SSHMUX_COMMAND_ALIVE_CHECK: | 1347 | case SSHMUX_COMMAND_ALIVE_CHECK: |
1346 | fprintf(stderr, "Master running (pid=%d)\r\n", | 1348 | fprintf(stderr, "Master running (pid=%d)\r\n", |
1347 | control_server_pid); | 1349 | control_server_pid); |
1348 | exit(0); | 1350 | exit(0); |
1349 | case SSHMUX_COMMAND_TERMINATE: | 1351 | case SSHMUX_COMMAND_TERMINATE: |