tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2010-10-21 15:21:11 +11:00
parent 9c0c31d2db
commit 68512c0341
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
20101021
- 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
20101011 20101011
- (djm) [canohost.c] Zero a4 instead of addr to better match type. - (djm) [canohost.c] Zero a4 instead of addr to better match type.
bz#1825, reported by foo AT mailinator.com bz#1825, reported by foo AT mailinator.com

4
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.22 2010/09/20 07:19:27 djm Exp $ */ /* $OpenBSD: mux.c,v 1.23 2010/10/12 02:22:24 dtucker Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -879,7 +879,7 @@ process_mux_stdio_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r)
if (options.control_master == SSHCTL_MASTER_ASK || if (options.control_master == SSHCTL_MASTER_ASK ||
options.control_master == SSHCTL_MASTER_AUTO_ASK) { options.control_master == SSHCTL_MASTER_AUTO_ASK) {
if (!ask_permission("Allow forward to to %s:%u? ", if (!ask_permission("Allow forward to %s:%u? ",
chost, cport)) { chost, cport)) {
debug2("%s: stdio fwd refused by user", __func__); debug2("%s: stdio fwd refused by user", __func__);
/* prepare reply */ /* prepare reply */