summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-14 09:01:54 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-14 09:01:54 +1000
commit47e713be94464b6ed7be0186e79c3f7b73f99936 (patch)
treedc38f80f6c4b45a81b4e29d2cd4382c84b9b3fa4 /mux.c
parentd9526a5e96e4515afec28df42b13d08bd02f754a (diff)
- dtucker@cvs.openbsd.org 2008/06/13 17:21:20
[mux.c] Friendlier error messages for mux fallback. ok djm@
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mux.c b/mux.c
index ce3015c3f..79f83768b 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.6 2008/06/13 00:47:53 dtucker Exp $ */ 1/* $OpenBSD: mux.c,v 1.7 2008/06/13 17:21:20 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -594,11 +594,11 @@ muxclient(const char *path)
594 594
595 /* Get authorisation status and PID of controlee */ 595 /* Get authorisation status and PID of controlee */
596 if (ssh_msg_recv(sock, &m) == -1) { 596 if (ssh_msg_recv(sock, &m) == -1) {
597 error("%s: msg_recv", __func__); 597 error("%s: Did not receive reply from master", __func__);
598 goto muxerr; 598 goto muxerr;
599 } 599 }
600 if (buffer_get_char(&m) != SSHMUX_VER) { 600 if (buffer_get_char(&m) != SSHMUX_VER) {
601 error("%s: wrong version", __func__); 601 error("%s: Master replied with wrong version", __func__);
602 goto muxerr; 602 goto muxerr;
603 } 603 }
604 if (buffer_get_int_ret(&allowed, &m) != 0) { 604 if (buffer_get_int_ret(&allowed, &m) != 0) {