summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-10-21 15:21:11 +1100
committerDamien Miller <djm@mindrot.org>2010-10-21 15:21:11 +1100
commit68512c034140611e9df7a52e12ac5e4cd19f2db1 (patch)
tree06eddc1d9440db8997f78bf7761fe9044938182e
parent9c0c31d2db8563b21e15d920ee589c891593a006 (diff)
- OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2010/10/12 02:22:24 [mux.c] Typo in confirmation message. bz#1827, patch from imorgan at nas nasa gov
-rw-r--r--ChangeLog7
-rw-r--r--mux.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f358d483..c0e3d3bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120101021
2 - OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2010/10/12 02:22:24
4 [mux.c]
5 Typo in confirmation message. bz#1827, patch from imorgan at
6 nas nasa gov
7
120101011 820101011
2 - (djm) [canohost.c] Zero a4 instead of addr to better match type. 9 - (djm) [canohost.c] Zero a4 instead of addr to better match type.
3 bz#1825, reported by foo AT mailinator.com 10 bz#1825, reported by foo AT mailinator.com
diff --git a/mux.c b/mux.c
index c010b614e..f1f7e6b13 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.22 2010/09/20 07:19:27 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.23 2010/10/12 02:22:24 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 *
@@ -879,7 +879,7 @@ process_mux_stdio_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r)
879 879
880 if (options.control_master == SSHCTL_MASTER_ASK || 880 if (options.control_master == SSHCTL_MASTER_ASK ||
881 options.control_master == SSHCTL_MASTER_AUTO_ASK) { 881 options.control_master == SSHCTL_MASTER_AUTO_ASK) {
882 if (!ask_permission("Allow forward to to %s:%u? ", 882 if (!ask_permission("Allow forward to %s:%u? ",
883 chost, cport)) { 883 chost, cport)) {
884 debug2("%s: stdio fwd refused by user", __func__); 884 debug2("%s: stdio fwd refused by user", __func__);
885 /* prepare reply */ 885 /* prepare reply */