diff options
author | Damien Miller <djm@mindrot.org> | 2005-05-26 12:11:28 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-05-26 12:11:28 +1000 |
commit | 538c9b71ecb11669053271ff95d7ce8a6d40294f (patch) | |
tree | 009ae7f5dc06b0fd853d45e4a499716063261f74 /ssh.c | |
parent | 924c25a64e063cf37eeeb3e5e5c0fa9a523435ff (diff) |
- djm@cvs.openbsd.org 2005/05/10 10:30:43
[ssh.c]
report real errors on fallback from ControlMaster=no to normal connect
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.238 2005/05/10 10:28:11 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.239 2005/05/10 10:30:43 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -1303,7 +1303,12 @@ control_client(const char *path) | |||
1303 | fatal("%s socket(): %s", __func__, strerror(errno)); | 1303 | fatal("%s socket(): %s", __func__, strerror(errno)); |
1304 | 1304 | ||
1305 | if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) { | 1305 | if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) { |
1306 | debug("Couldn't connect to %s: %s", path, strerror(errno)); | 1306 | if (errno == ENOENT) |
1307 | debug("Control socket \"%.100s\" does not exist", path); | ||
1308 | else { | ||
1309 | error("Control socket connect(%.100s): %s", path, | ||
1310 | strerror(errno)); | ||
1311 | } | ||
1307 | close(sock); | 1312 | close(sock); |
1308 | return; | 1313 | return; |
1309 | } | 1314 | } |