summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2016-06-03 03:14:41 +0000
committerdtucker <dtucker@openbsd.org>2016-06-03 03:14:41 +0000
commitf76742ff279773be750996c0bf0c71b2ca78e983 (patch)
treebadbb2f0bf9e03c968fdf37e4509051c5f1d4305 /usr.bin/ssh/readconf.c
parentset rt_expire times against time_uptime, not time_second. (diff)
downloadwireguard-openbsd-f76742ff279773be750996c0bf0c71b2ca78e983.tar.xz
wireguard-openbsd-f76742ff279773be750996c0bf0c71b2ca78e983.zip
Move the host and port used by ssh -W into the Options struct.
This will make future changes a bit easier. ok djm@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index b9cb3884e9e..785003e3533 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.254 2016/05/04 14:29:58 markus Exp $ */
+/* $OpenBSD: readconf.c,v 1.255 2016/06/03 03:14:41 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1733,6 +1733,8 @@ initialize_options(Options * options)
options->forward_x11 = -1;
options->forward_x11_trusted = -1;
options->forward_x11_timeout = -1;
+ options->stdio_forward_host = NULL;
+ options->stdio_forward_port = 0;
options->exit_on_forward_failure = -1;
options->xauth_location = NULL;
options->fwd_opts.gateway_ports = -1;