summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--mux.c6
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 @@
12 - dtucker@cvs.openbsd.org 2008/06/13 14:18:51 12 - dtucker@cvs.openbsd.org 2008/06/13 14:18:51
13 [auth2-pubkey.c auth-rhosts.c] 13 [auth2-pubkey.c auth-rhosts.c]
14 Include unistd.h for close(), prevents warnings in -portable 14 Include unistd.h for close(), prevents warnings in -portable
15 - dtucker@cvs.openbsd.org 2008/06/13 17:21:20
16 [mux.c]
17 Friendlier error messages for mux fallback. ok djm@
15 18
1620080612 1920080612
17 - (dtucker) OpenBSD CVS Sync 20 - (dtucker) OpenBSD CVS Sync
@@ -4350,4 +4353,4 @@
4350 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4353 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4351 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4354 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4352 4355
4353$Id: ChangeLog,v 1.5006 2008/06/13 23:01:24 dtucker Exp $ 4356$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 @@
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) {