summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 089af477f..a84287c81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@
50 - djm@cvs.openbsd.org 2005/05/10 10:28:11 50 - djm@cvs.openbsd.org 2005/05/10 10:28:11
51 [ssh.c] 51 [ssh.c]
52 print nice error message for EADDRINUSE as well (ID sync only) 52 print nice error message for EADDRINUSE as well (ID sync only)
53 - djm@cvs.openbsd.org 2005/05/10 10:30:43
54 [ssh.c]
55 report real errors on fallback from ControlMaster=no to normal connect
53 56
5420050524 5720050524
55 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 58 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2549,4 +2552,4 @@
2549 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2552 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2550 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2553 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2551 2554
2552$Id: ChangeLog,v 1.3775 2005/05/26 02:09:32 djm Exp $ 2555$Id: ChangeLog,v 1.3776 2005/05/26 02:11:28 djm Exp $
diff --git a/ssh.c b/ssh.c
index 88bb308ae..7754f581c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.238 2005/05/10 10:28:11 djm Exp $"); 43RCSID("$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 }