summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh.c b/ssh.c
index 43d97abcc..cabc538e3 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.247 2005/07/04 00:58:43 djm Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.248 2005/07/16 01:35:24 djm Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -790,8 +790,8 @@ ssh_init_forwarding(void)
790 for (i = 0; i < options.num_remote_forwards; i++) { 790 for (i = 0; i < options.num_remote_forwards; i++) {
791 debug("Remote connections from %.200s:%d forwarded to " 791 debug("Remote connections from %.200s:%d forwarded to "
792 "local address %.200s:%d", 792 "local address %.200s:%d",
793 (options.remote_forwards[i].listen_host == NULL) ? 793 (options.remote_forwards[i].listen_host == NULL) ?
794 (options.gateway_ports ? "*" : "LOCALHOST") : 794 (options.gateway_ports ? "*" : "LOCALHOST") :
795 options.remote_forwards[i].listen_host, 795 options.remote_forwards[i].listen_host,
796 options.remote_forwards[i].listen_port, 796 options.remote_forwards[i].listen_port,
797 options.remote_forwards[i].connect_host, 797 options.remote_forwards[i].connect_host,
@@ -1037,7 +1037,7 @@ ssh_session2_setup(int id, void *arg)
1037 const char *display; 1037 const char *display;
1038 int interactive = tty_flag; 1038 int interactive = tty_flag;
1039 1039
1040 display = getenv("DISPLAY"); 1040 display = getenv("DISPLAY");
1041 if (options.forward_x11 && display != NULL) { 1041 if (options.forward_x11 && display != NULL) {
1042 char *proto, *data; 1042 char *proto, *data;
1043 /* Get reasonable local authentication information. */ 1043 /* Get reasonable local authentication information. */
@@ -1253,7 +1253,7 @@ control_client(const char *path)
1253 close(sock); 1253 close(sock);
1254 return; 1254 return;
1255 } 1255 }
1256 1256
1257 if (stdin_null_flag) { 1257 if (stdin_null_flag) {
1258 if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1) 1258 if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
1259 fatal("open(/dev/null): %s", strerror(errno)); 1259 fatal("open(/dev/null): %s", strerror(errno));
@@ -1262,7 +1262,7 @@ control_client(const char *path)
1262 if (fd > STDERR_FILENO) 1262 if (fd > STDERR_FILENO)
1263 close(fd); 1263 close(fd);
1264 } 1264 }
1265 1265
1266 term = getenv("TERM"); 1266 term = getenv("TERM");
1267 1267
1268 flags = 0; 1268 flags = 0;