- (dtucker) [roaming_client.c] Wrap inttypes.h in an ifdef.

[openssh.git] / mux.c

diff --git a/mux.c b/mux.c
index ce3015c3fc9150e95ab67866244dbfe723a3f6ba..fac43a71f7fef1e53acd1d63a5b30422d8e14f44 100644 (file)
--- 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.8 2009/08/20 23:54:28 dtucker Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -85,7 +85,7 @@ extern int tty_flag;
 extern Options options;
 extern int stdin_null_flag;
 extern char *host;
-int subsystem_flag;
+extern int subsystem_flag;
 extern Buffer command;
 
 /* Context for session open confirmation callback */
@@ -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) {