- deraadt@cvs.openbsd.org 2006/03/19 18:59:30
[ssh.c]
spacing
diff --git a/ChangeLog b/ChangeLog
index 2b25990..bd7b34c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
- deraadt@cvs.openbsd.org 2006/03/19 18:59:49
[ssh-keyscan.c]
please lint
+ - deraadt@cvs.openbsd.org 2006/03/19 18:59:30
+ [ssh.c]
+ spacing
20060325
- OpenBSD CVS Sync
@@ -4306,4 +4309,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4255 2006/03/26 02:59:38 djm Exp $
+$Id: ChangeLog,v 1.4256 2006/03/26 02:59:59 djm Exp $
diff --git a/ssh.c b/ssh.c
index 9402491..3615d1c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1305,23 +1305,23 @@
strerror(errno));
}
if (errno == ENOENT)
- debug("Control socket \"%.100s\" does not exist", path);
+ debug("Control socket \"%.100s\" does not exist", path);
else {
- error("Control socket connect(%.100s): %s", path,
+ error("Control socket connect(%.100s): %s", path,
strerror(errno));
}
- close(sock);
- return;
- }
+ close(sock);
+ return;
+ }
- if (stdin_null_flag) {
- if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
- fatal("open(/dev/null): %s", strerror(errno));
- if (dup2(fd, STDIN_FILENO) == -1)
- fatal("dup2: %s", strerror(errno));
- if (fd > STDERR_FILENO)
- close(fd);
- }
+ if (stdin_null_flag) {
+ if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
+ fatal("open(/dev/null): %s", strerror(errno));
+ if (dup2(fd, STDIN_FILENO) == -1)
+ fatal("dup2: %s", strerror(errno));
+ if (fd > STDERR_FILENO)
+ close(fd);
+ }
term = getenv("TERM");