summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c28
2 files changed, 18 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b2599023..bd7b34ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
49 - deraadt@cvs.openbsd.org 2006/03/19 18:59:49 49 - deraadt@cvs.openbsd.org 2006/03/19 18:59:49
50 [ssh-keyscan.c] 50 [ssh-keyscan.c]
51 please lint 51 please lint
52 - deraadt@cvs.openbsd.org 2006/03/19 18:59:30
53 [ssh.c]
54 spacing
52 55
5320060325 5620060325
54 - OpenBSD CVS Sync 57 - OpenBSD CVS Sync
@@ -4306,4 +4309,4 @@
4306 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4309 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4307 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4310 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4308 4311
4309$Id: ChangeLog,v 1.4255 2006/03/26 02:59:38 djm Exp $ 4312$Id: ChangeLog,v 1.4256 2006/03/26 02:59:59 djm Exp $
diff --git a/ssh.c b/ssh.c
index 9402491e3..3615d1c40 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1305,23 +1305,23 @@ control_client(const char *path)
1305 strerror(errno)); 1305 strerror(errno));
1306 } 1306 }
1307 if (errno == ENOENT) 1307 if (errno == ENOENT)
1308 debug("Control socket \"%.100s\" does not exist", path); 1308 debug("Control socket \"%.100s\" does not exist", path);
1309 else { 1309 else {
1310 error("Control socket connect(%.100s): %s", path, 1310 error("Control socket connect(%.100s): %s", path,
1311 strerror(errno)); 1311 strerror(errno));
1312 } 1312 }
1313 close(sock); 1313 close(sock);
1314 return; 1314 return;
1315 } 1315 }
1316 1316
1317 if (stdin_null_flag) { 1317 if (stdin_null_flag) {
1318 if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1) 1318 if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
1319 fatal("open(/dev/null): %s", strerror(errno)); 1319 fatal("open(/dev/null): %s", strerror(errno));
1320 if (dup2(fd, STDIN_FILENO) == -1) 1320 if (dup2(fd, STDIN_FILENO) == -1)
1321 fatal("dup2: %s", strerror(errno)); 1321 fatal("dup2: %s", strerror(errno));
1322 if (fd > STDERR_FILENO) 1322 if (fd > STDERR_FILENO)
1323 close(fd); 1323 close(fd);
1324 } 1324 }
1325 1325
1326 term = getenv("TERM"); 1326 term = getenv("TERM");
1327 1327