2 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 013e23e60..4a3ee6670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
    - djm@cvs.openbsd.org 2006/06/14 10:50:42
      [sshconnect.c]
      limit the number of pre-banner characters we will accept; ok markus@
+   - djm@cvs.openbsd.org 2006/06/26 10:36:15
+     [clientloop.c]
+     mention optional bind_address in runtime port forwarding setup
+     command-line help. patch from santhi.amirta AT gmail.com
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4737,4 +4741,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4360 2006/07/10 10:15:56 djm Exp $
+$Id: ChangeLog,v 1.4361 2006/07/10 10:16:12 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index a9572134a..b99ba03c0 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.163 2006/05/16 09:00:00 markus Exp $ */
+/* $OpenBSD: clientloop.c,v 1.164 2006/06/26 10:36:15 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -925,12 +925,16 @@ process_cmdline(void)
 
         if (*s == 'h' || *s == 'H' || *s == '?') {
                 logit("Commands:");
-                logit("      -Lport:host:hostport    Request local forward");
-                logit("      -Rport:host:hostport    Request remote forward");
-                logit("      -KRhostport             Cancel remote forward");
+                logit("      -L[bind_address:]port:host:hostport    "
+                    "Request local forward");
+                logit("      -R[bind_address:]port:host:hostport    "
+                    "Request remote forward");
+                logit("      -KR[bind_address:]hostport             "
+                    "Cancel remote forward");
                 if (!options.permit_local_command)
                         goto out;
-                logit("      !args                   Execute local command");
+                logit("      !args                                  "
+                    "Execute local command");
                 goto out;
         }