diff options
author | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-06-03 04:09:40 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-06-03 04:09:40 +0000 |
commit | 26916f74d0639b2366db703a953f4734f4a653e9 (patch) | |
tree | d258e1eeffabfdeb403974e902d7da97b1312da0 /usr.bin/ssh/ssh.1 | |
parent | 17ce956acd2007ab48568f90011ddaa79c66d139 (diff) |
Allow ExitOnForwardFailure and ClearAllForwardings to be overridden when
using ssh -W (but still default to yes in that case). bz#2577, ok djm@.
Diffstat (limited to 'usr.bin/ssh/ssh.1')
-rw-r--r-- | usr.bin/ssh/ssh.1 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 9ed5a5662aa..4c5ab2157b2 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.371 2016/05/04 12:21:53 markus Exp $ -.Dd $Mdocdate: May 4 2016 $ +.\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $ +.Dd $Mdocdate: June 3 2016 $ .Dt SSH 1 .Os .Sh NAME @@ -709,7 +709,10 @@ Implies .Fl T , .Cm ExitOnForwardFailure and -.Cm ClearAllForwardings . +.Cm ClearAllForwardings +although these can be overridden in the configuration file or +.Fl o +command line options. .Pp .It Fl w Xo .Ar local_tun Ns Op : Ns Ar remote_tun |