diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 13:59:59 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 13:59:59 +1100 |
commit | 4662d3492f24cf1d7974db805215c801e50cffc3 (patch) | |
tree | 00d72a1198c7523b36f0eda08a01f4097e0afe1b | |
parent | 3bbaba60753b3987ba822a2cbf619fb00072a9e5 (diff) |
- deraadt@cvs.openbsd.org 2006/03/19 18:59:30
[ssh.c]
spacing
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 28 |
2 files changed, 18 insertions, 15 deletions
@@ -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 | ||
53 | 20060325 | 56 | 20060325 |
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 $ |
@@ -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 | ||