[ssh.c]
     spacing
This commit is contained in:
Damien Miller 2006-03-26 13:59:59 +11:00
parent 3bbaba6075
commit 4662d3492f
2 changed files with 17 additions and 14 deletions

View File

@ -49,6 +49,9 @@
- deraadt@cvs.openbsd.org 2006/03/19 18:59:49 - deraadt@cvs.openbsd.org 2006/03/19 18:59:49
[ssh-keyscan.c] [ssh-keyscan.c]
please lint please lint
- deraadt@cvs.openbsd.org 2006/03/19 18:59:30
[ssh.c]
spacing
20060325 20060325
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4306,4 +4309,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

26
ssh.c
View File

@ -1305,23 +1305,23 @@ control_client(const char *path)
strerror(errno)); strerror(errno));
} }
if (errno == ENOENT) if (errno == ENOENT)
debug("Control socket \"%.100s\" does not exist", path); debug("Control socket \"%.100s\" does not exist", path);
else { else {
error("Control socket connect(%.100s): %s", path, error("Control socket connect(%.100s): %s", path,
strerror(errno)); strerror(errno));
} }
close(sock); close(sock);
return; return;
} }
if (stdin_null_flag) { if (stdin_null_flag) {
if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1) if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
fatal("open(/dev/null): %s", strerror(errno)); fatal("open(/dev/null): %s", strerror(errno));
if (dup2(fd, STDIN_FILENO) == -1) if (dup2(fd, STDIN_FILENO) == -1)
fatal("dup2: %s", strerror(errno)); fatal("dup2: %s", strerror(errno));
if (fd > STDERR_FILENO) if (fd > STDERR_FILENO)
close(fd); close(fd);
} }
term = getenv("TERM"); term = getenv("TERM");