summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--clientloop.c14
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 @@
4 - djm@cvs.openbsd.org 2006/06/14 10:50:42 4 - djm@cvs.openbsd.org 2006/06/14 10:50:42
5 [sshconnect.c] 5 [sshconnect.c]
6 limit the number of pre-banner characters we will accept; ok markus@ 6 limit the number of pre-banner characters we will accept; ok markus@
7 - djm@cvs.openbsd.org 2006/06/26 10:36:15
8 [clientloop.c]
9 mention optional bind_address in runtime port forwarding setup
10 command-line help. patch from santhi.amirta AT gmail.com
7 11
820060706 1220060706
9 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 13 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4737,4 +4741,4 @@
4737 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4741 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4738 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4742 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4739 4743
4740$Id: ChangeLog,v 1.4360 2006/07/10 10:15:56 djm Exp $ 4744$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 @@
1/* $OpenBSD: clientloop.c,v 1.163 2006/05/16 09:00:00 markus Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.164 2006/06/26 10:36:15 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -925,12 +925,16 @@ process_cmdline(void)
925 925
926 if (*s == 'h' || *s == 'H' || *s == '?') { 926 if (*s == 'h' || *s == 'H' || *s == '?') {
927 logit("Commands:"); 927 logit("Commands:");
928 logit(" -Lport:host:hostport Request local forward"); 928 logit(" -L[bind_address:]port:host:hostport "
929 logit(" -Rport:host:hostport Request remote forward"); 929 "Request local forward");
930 logit(" -KRhostport Cancel remote forward"); 930 logit(" -R[bind_address:]port:host:hostport "
931 "Request remote forward");
932 logit(" -KR[bind_address:]hostport "
933 "Cancel remote forward");
931 if (!options.permit_local_command) 934 if (!options.permit_local_command)
932 goto out; 935 goto out;
933 logit(" !args Execute local command"); 936 logit(" !args "
937 "Execute local command");
934 goto out; 938 goto out;
935 } 939 }
936 940