- 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

diff --git a/ChangeLog b/ChangeLog
index 1f358d483a31ed150a758071a8ea42f3de35302c..c0e3d3bf3b6e8796b0830aa3f55b6867b5206584 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  - (djm) [canohost.c] Zero a4 instead of addr to better match type.
    bz#1825, reported by foo AT mailinator.com

diff --git a/mux.c b/mux.c
index c010b614e209bb417f76457a22d2d653561a5b41..f1f7e6b13a5a6652440ee72b768c0f8821a1baa9 100644 (file)
--- a/mux.c
+++ b/mux.c
@@ -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>
  *
@@ -879,7 +879,7 @@ process_mux_stdio_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r)
 
        if (options.control_master == SSHCTL_MASTER_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)) {
                        debug2("%s: stdio fwd refused by user", __func__);
                        /* prepare reply */