diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-06-03 04:09:38 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-06-08 11:39:31 +1000 |
| commit | 0cb2f4c2494b115d0f346ed2d8b603ab3ba643f4 (patch) | |
| tree | 541671083abd0311f6a5e1c8af47bf79cb6c8056 /ssh.1 | |
| parent | 8543ff3f5020fe659839b15f05b8c522bde6cee5 (diff) | |
upstream commit
Allow ExitOnForwardFailure and ClearAllForwardings to be
overridden when using ssh -W (but still default to yes in that case).
bz#2577, ok djm@.
Upstream-ID: 4b20c419e93ca11a861c81c284090cfabc8c54d4
Diffstat (limited to 'ssh.1')
| -rw-r--r-- | ssh.1 | 9 |
1 files changed, 6 insertions, 3 deletions
| @@ -33,8 +33,8 @@ | |||
| 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 35 | .\" | 35 | .\" |
| 36 | .\" $OpenBSD: ssh.1,v 1.371 2016/05/04 12:21:53 markus Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $ |
| 37 | .Dd $Mdocdate: May 4 2016 $ | 37 | .Dd $Mdocdate: June 3 2016 $ |
| 38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -709,7 +709,10 @@ Implies | |||
| 709 | .Fl T , | 709 | .Fl T , |
| 710 | .Cm ExitOnForwardFailure | 710 | .Cm ExitOnForwardFailure |
| 711 | and | 711 | and |
| 712 | .Cm ClearAllForwardings . | 712 | .Cm ClearAllForwardings |
| 713 | although these can be overridden in the configuration file or | ||
| 714 | .Fl o | ||
| 715 | command line options. | ||
| 713 | .Pp | 716 | .Pp |
| 714 | .It Fl w Xo | 717 | .It Fl w Xo |
| 715 | .Ar local_tun Ns Op : Ns Ar remote_tun | 718 | .Ar local_tun Ns Op : Ns Ar remote_tun |