diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | ssh.1 | 6 |
3 files changed, 10 insertions, 5 deletions
@@ -20,6 +20,9 @@ | |||
20 | [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c] | 20 | [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c] |
21 | move #include <grp.h> out of includes.h | 21 | move #include <grp.h> out of includes.h |
22 | (portable needed uidswap.c too) | 22 | (portable needed uidswap.c too) |
23 | - stevesk@cvs.openbsd.org 2006/07/02 23:01:55 | ||
24 | [clientloop.c ssh.1] | ||
25 | use -KR[bind_address:]port here; ok djm@ | ||
23 | 26 | ||
24 | 20060706 | 27 | 20060706 |
25 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 28 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4753,4 +4756,4 @@ | |||
4753 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4756 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4754 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4757 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4755 | 4758 | ||
4756 | $Id: ChangeLog,v 1.4364 2006/07/10 10:20:33 djm Exp $ | 4759 | $Id: ChangeLog,v 1.4365 2006/07/10 10:20:52 djm Exp $ |
diff --git a/clientloop.c b/clientloop.c index b99ba03c0..fb66a6e40 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.164 2006/06/26 10:36:15 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.165 2006/07/02 23:01:55 stevesk 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 |
@@ -929,7 +929,7 @@ process_cmdline(void) | |||
929 | "Request local forward"); | 929 | "Request local forward"); |
930 | logit(" -R[bind_address:]port:host:hostport " | 930 | logit(" -R[bind_address:]port:host:hostport " |
931 | "Request remote forward"); | 931 | "Request remote forward"); |
932 | logit(" -KR[bind_address:]hostport " | 932 | logit(" -KR[bind_address:]port " |
933 | "Cancel remote forward"); | 933 | "Cancel remote forward"); |
934 | if (!options.permit_local_command) | 934 | if (!options.permit_local_command) |
935 | goto out; | 935 | goto out; |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.261 2006/07/02 17:12:58 stevesk Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.262 2006/07/02 23:01:55 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -885,7 +885,9 @@ and | |||
885 | options (see above). | 885 | options (see above). |
886 | It also allows the cancellation of existing remote port-forwardings | 886 | It also allows the cancellation of existing remote port-forwardings |
887 | using | 887 | using |
888 | .Fl KR Ar hostport . | 888 | .Sm off |
889 | .Fl KR Oo Ar bind_address : Oc Ar port . | ||
890 | .Sm on | ||
889 | .Ic !\& Ns Ar command | 891 | .Ic !\& Ns Ar command |
890 | allows the user to execute a local command if the | 892 | allows the user to execute a local command if the |
891 | .Ic PermitLocalCommand | 893 | .Ic PermitLocalCommand |