summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-14 12:01:29 +1100
committerDamien Miller <djm@mindrot.org>2011-01-14 12:01:29 +1100
commit445c9a507d23bd84e146133dcb2b9ba07ab216c6 (patch)
treeb6a37f3398029a639c7b36a0ef8f1c3a83be4948 /mux.c
parent5278806e39bb1794959c71bba61610efb6ec0d58 (diff)
- djm@cvs.openbsd.org 2011/01/13 21:54:53
[mux.c] correct error messages; patch from bert.wesarg AT googlemail.com
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mux.c b/mux.c
index f1f7e6b13..e370462db 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.23 2010/10/12 02:22:24 dtucker Exp $ */ 1/* $OpenBSD: mux.c,v 1.24 2011/01/13 21:54:53 djm 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 *
@@ -1530,7 +1530,7 @@ mux_client_request_forward(int fd, u_int ftype, Forward *fwd)
1530 case MUX_S_FAILURE: 1530 case MUX_S_FAILURE:
1531 e = buffer_get_string(&m, NULL); 1531 e = buffer_get_string(&m, NULL);
1532 buffer_free(&m); 1532 buffer_free(&m);
1533 error("%s: session request failed: %s", __func__, e); 1533 error("%s: forwarding request failed: %s", __func__, e);
1534 return -1; 1534 return -1;
1535 default: 1535 default:
1536 fatal("%s: unexpected response from master 0x%08x", 1536 fatal("%s: unexpected response from master 0x%08x",
@@ -1649,12 +1649,12 @@ mux_client_request_session(int fd)
1649 case MUX_S_PERMISSION_DENIED: 1649 case MUX_S_PERMISSION_DENIED:
1650 e = buffer_get_string(&m, NULL); 1650 e = buffer_get_string(&m, NULL);
1651 buffer_free(&m); 1651 buffer_free(&m);
1652 error("Master refused forwarding request: %s", e); 1652 error("Master refused session request: %s", e);
1653 return -1; 1653 return -1;
1654 case MUX_S_FAILURE: 1654 case MUX_S_FAILURE:
1655 e = buffer_get_string(&m, NULL); 1655 e = buffer_get_string(&m, NULL);
1656 buffer_free(&m); 1656 buffer_free(&m);
1657 error("%s: forwarding request failed: %s", __func__, e); 1657 error("%s: session request failed: %s", __func__, e);
1658 return -1; 1658 return -1;
1659 default: 1659 default:
1660 buffer_free(&m); 1660 buffer_free(&m);
@@ -1781,7 +1781,7 @@ mux_client_request_stdio_fwd(int fd)
1781 case MUX_S_PERMISSION_DENIED: 1781 case MUX_S_PERMISSION_DENIED:
1782 e = buffer_get_string(&m, NULL); 1782 e = buffer_get_string(&m, NULL);
1783 buffer_free(&m); 1783 buffer_free(&m);
1784 fatal("Master refused forwarding request: %s", e); 1784 fatal("Master refused stdio forwarding request: %s", e);
1785 case MUX_S_FAILURE: 1785 case MUX_S_FAILURE:
1786 e = buffer_get_string(&m, NULL); 1786 e = buffer_get_string(&m, NULL);
1787 buffer_free(&m); 1787 buffer_free(&m);