diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-03-19 18:59:30 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-03-19 18:59:30 +0000 |
| commit | 80459a7bac741d0667d34882779ea9a8d3ccbe26 (patch) | |
| tree | 07bd7542644c60ef3f9c043ff0412c6cf8457655 /usr.bin/ssh/ssh.c | |
| parent | whoever thought that break after return was a good idea needs to get their head examimed (diff) | |
| download | wireguard-openbsd-80459a7bac741d0667d34882779ea9a8d3ccbe26.tar.xz wireguard-openbsd-80459a7bac741d0667d34882779ea9a8d3ccbe26.zip | |
spacing
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 03e2cc2366d..bb99ca77142 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1284,23 +1284,23 @@ control_client(const char *path) 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; - } - - 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); - } + 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); + } term = getenv("TERM"); |