summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2008-06-13 17:21:20 +0000
committerdtucker <dtucker@openbsd.org>2008-06-13 17:21:20 +0000
commit207358ec17c269bba713e32cd15dc1640a3e1bfc (patch)
treefe120b6dbb6c7d0de95cbaa30b7602fb7d2f773a
parentnuke a bunch of bogus ARGSUSED; (diff)
downloadwireguard-openbsd-207358ec17c269bba713e32cd15dc1640a3e1bfc.tar.xz
wireguard-openbsd-207358ec17c269bba713e32cd15dc1640a3e1bfc.zip
Friendlier error messages for mux fallback. ok djm@
-rw-r--r--usr.bin/ssh/mux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c
index 38b6c6c2035..a6f45d19529 100644
--- a/usr.bin/ssh/mux.c
+++ b/usr.bin/ssh/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>
*
@@ -582,11 +582,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) {