diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2005-05-10 10:30:44 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2005-05-10 10:30:44 +0000 |
| commit | b591edece7817e46dd6efa04eec0dac0a75a006e (patch) | |
| tree | a64185d9148a218c65ac364988e943169b216fe6 /usr.bin/ssh | |
| parent | 16dfd95e8047b40116eedaff3781d0db24c353db (diff) | |
report real errors on fallback from ControlMaster=no to normal connect
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index f0d37d01b09..e20aa31a809 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.238 2005/05/10 10:28:11 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.239 2005/05/10 10:30:43 djm Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -1291,7 +1291,12 @@ control_client(const char *path) fatal("%s socket(): %s", __func__, strerror(errno)); if (connect(sock, (struct sockaddr*)&addr, addr.sun_len) == -1) { - debug("Couldn't connect to %s: %s", path, strerror(errno)); + if (errno == ENOENT) + debug("Control socket \"%.100s\" does not exist", path); + else { + error("Control socket connect(%.100s): %s", path, + strerror(errno)); + } close(sock); return; } |