RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-21 08:52:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
dtucker@openbsd.org 2016-06-03 04:09:38 +00:00 committed by Damien Miller
parent 8543ff3f50
commit 0cb2f4c249
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.255 2016/06/03 03:14:41 dtucker Exp $ */ /* $OpenBSD: readconf.c,v 1.256 2016/06/03 04:09:38 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1750,6 +1750,7 @@ initialize_options(Options * options)
options->forward_x11_timeout = -1; options->forward_x11_timeout = -1;
options->stdio_forward_host = NULL; options->stdio_forward_host = NULL;
options->stdio_forward_port = 0; options->stdio_forward_port = 0;
options->clear_forwardings = -1;
options->exit_on_forward_failure = -1; options->exit_on_forward_failure = -1;
options->xauth_location = NULL; options->xauth_location = NULL;
options->fwd_opts.gateway_ports = -1; options->fwd_opts.gateway_ports = -1;
@ -1796,7 +1797,6 @@ initialize_options(Options * options)
options->num_local_forwards = 0; options->num_local_forwards = 0;
options->remote_forwards = NULL; options->remote_forwards = NULL;
options->num_remote_forwards = 0; options->num_remote_forwards = 0;
options->clear_forwardings = -1;
options->log_level = SYSLOG_LEVEL_NOT_SET; options->log_level = SYSLOG_LEVEL_NOT_SET;
options->preferred_authentications = NULL; options->preferred_authentications = NULL;
options->bind_address = NULL; options->bind_address = NULL;
@ -1870,8 +1870,19 @@ fill_default_options(Options * options)
options->forward_x11_trusted = 0; options->forward_x11_trusted = 0;
if (options->forward_x11_timeout == -1) if (options->forward_x11_timeout == -1)
options->forward_x11_timeout = 1200; options->forward_x11_timeout = 1200;
/*
* stdio forwarding (-W) changes the default for these but we defer
* setting the values so they can be overridden.
*/
if (options->exit_on_forward_failure == -1) if (options->exit_on_forward_failure == -1)
options->exit_on_forward_failure = 0; options->exit_on_forward_failure =
options->stdio_forward_host != NULL ? 1 : 0;
if (options->clear_forwardings == -1)
options->clear_forwardings =
options->stdio_forward_host != NULL ? 1 : 0;
if (options->clear_forwardings == 1)
clear_forwardings(options);
if (options->xauth_location == NULL) if (options->xauth_location == NULL)
options->xauth_location = _PATH_XAUTH; options->xauth_location = _PATH_XAUTH;
if (options->fwd_opts.gateway_ports == -1) if (options->fwd_opts.gateway_ports == -1)
@ -1962,8 +1973,6 @@ fill_default_options(Options * options)
} }
if (options->log_level == SYSLOG_LEVEL_NOT_SET) if (options->log_level == SYSLOG_LEVEL_NOT_SET)
options->log_level = SYSLOG_LEVEL_INFO; options->log_level = SYSLOG_LEVEL_INFO;
if (options->clear_forwardings == 1)
clear_forwardings(options);
if (options->no_host_authentication_for_localhost == - 1) if (options->no_host_authentication_for_localhost == - 1)
options->no_host_authentication_for_localhost = 0; options->no_host_authentication_for_localhost = 0;
if (options->identities_only == -1) if (options->identities_only == -1)
@ -2424,6 +2433,7 @@ dump_client_config(Options *o, const char *host)
dump_cfg_fmtint(oCompression, o->compression); dump_cfg_fmtint(oCompression, o->compression);
dump_cfg_fmtint(oControlMaster, o->control_master); dump_cfg_fmtint(oControlMaster, o->control_master);
dump_cfg_fmtint(oEnableSSHKeysign, o->enable_ssh_keysign); dump_cfg_fmtint(oEnableSSHKeysign, o->enable_ssh_keysign);
dump_cfg_fmtint(oClearAllForwardings, o->clear_forwardings);
dump_cfg_fmtint(oExitOnForwardFailure, o->exit_on_forward_failure); dump_cfg_fmtint(oExitOnForwardFailure, o->exit_on_forward_failure);
dump_cfg_fmtint(oFingerprintHash, o->fingerprint_hash); dump_cfg_fmtint(oFingerprintHash, o->fingerprint_hash);
dump_cfg_fmtint(oForwardAgent, o->forward_agent); dump_cfg_fmtint(oForwardAgent, o->forward_agent);

9
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $
.Dd $Mdocdate: May 4 2016 $ .Dd $Mdocdate: June 3 2016 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -709,7 +709,10 @@ Implies
.Fl T , .Fl T ,
.Cm ExitOnForwardFailure .Cm ExitOnForwardFailure
and and
.Cm ClearAllForwardings . .Cm ClearAllForwardings
although these can be overridden in the configuration file or
.Fl o
command line options.
.Pp .Pp
.It Fl w Xo .It Fl w Xo
.Ar local_tun Ns Op : Ns Ar remote_tun .Ar local_tun Ns Op : Ns Ar remote_tun

4
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.441 2016/06/03 03:14:41 dtucker Exp $ */ /* $OpenBSD: ssh.c,v 1.442 2016/06/03 04:09:39 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -782,8 +782,6 @@ main(int ac, char **av)
} }
options.request_tty = REQUEST_TTY_NO; options.request_tty = REQUEST_TTY_NO;
no_shell_flag = 1; no_shell_flag = 1;
options.clear_forwardings = 1;
options.exit_on_forward_failure = 1;
break; break;
case 'q': case 'q':
options.log_level = SYSLOG_LEVEL_QUIET; options.log_level = SYSLOG_LEVEL_QUIET;