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 @@
    - djm@cvs.openbsd.org 2005/05/10 10:28:11
      [ssh.c]
      print nice error message for EADDRINUSE as well (ID sync only)
+   - djm@cvs.openbsd.org 2005/05/10 10:30:43
+     [ssh.c]
+     report real errors on fallback from ControlMaster=no to normal connect
 
 20050524
  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2549,4 +2552,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3775 2005/05/26 02:09:32 djm Exp $
+$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 @@
  */
 
 #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>
@@ -1303,7 +1303,12 @@ control_client(const char *path)
                 fatal("%s socket(): %s", __func__, strerror(errno));
 
         if (connect(sock, (struct sockaddr*)&addr, addr_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;
         }