diff options
| author |   dtucker <dtucker@openbsd.org> | 2016-06-03 04:09:38 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2016-06-03 04:09:38 +0000 |
| commit | 8aa9e25970e62db46a78a229bb9e01dc99a7d062 (patch) | |
| tree | c6768561622d12a4ad50a41ddc0a04164756e28a /usr.bin/ssh/ssh.c | |
| parent | defer the freeing of art tables and nodes to a task. (diff) | |
| download | wireguard-openbsd-8aa9e25970e62db46a78a229bb9e01dc99a7d062.tar.xz wireguard-openbsd-8aa9e25970e62db46a78a229bb9e01dc99a7d062.zip | |
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.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index bf715c561b2..b82ce963822 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -752,8 +752,6 @@ main(int ac, char **av) } options.request_tty = REQUEST_TTY_NO; no_shell_flag = 1; - options.clear_forwardings = 1; - options.exit_on_forward_failure = 1; break; case 'q': options.log_level = SYSLOG_LEVEL_QUIET; |