2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b18aea38..0b7387c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
    - dtucker@cvs.openbsd.org 2008/06/13 14:18:51
      [auth2-pubkey.c auth-rhosts.c]
      Include unistd.h for close(), prevents warnings in -portable
+   - dtucker@cvs.openbsd.org 2008/06/13 17:21:20
+     [mux.c]
+     Friendlier error messages for mux fallback.  ok djm@
 
 20080612
  - (dtucker) OpenBSD CVS Sync
@@ -4350,4 +4353,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5006 2008/06/13 23:01:24 dtucker Exp $
+$Id: ChangeLog,v 1.5007 2008/06/13 23:01:54 dtucker Exp $
diff --git a/mux.c b/mux.c
index ce3015c3f..79f83768b 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.6 2008/06/13 00:47:53 dtucker Exp $ */
+/* $OpenBSD: mux.c,v 1.7 2008/06/13 17:21:20 dtucker Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -594,11 +594,11 @@ muxclient(const char *path)
 
         /* Get authorisation status and PID of controlee */
         if (ssh_msg_recv(sock, &m) == -1) {
-                error("%s: msg_recv", __func__);
+                error("%s: Did not receive reply from master", __func__);
                 goto muxerr;
         }
         if (buffer_get_char(&m) != SSHMUX_VER) {
-                error("%s: wrong version", __func__);
+                error("%s: Master replied with wrong version", __func__);
                 goto muxerr;
         }
         if (buffer_get_int_ret(&allowed, &m) != 0) {