summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-04-06 06:42:17 +0000
committerDarren Tucker <dtucker@zip.com.au>2016-04-08 14:26:06 +1000
commit0ccbd5eca0f0dd78e71a4b69c66f03a66908d558 (patch)
treed3b976a3f09569186f2a03d1b87c342432cd4f3c /misc.h
parent574def0eb493cd6efeffd4ff2e9257abcffee0c8 (diff)
upstream commit
don't record duplicate LocalForward and RemoteForward entries; fixes failure with ExitOnForwardFailure+hostname canonicalisation where the same forwards are added on the second pass through the configuration file. bz#2562; ok dtucker@ Upstream-ID: 40a51d68b6300f1cc61deecdb7d4847b8b7b0de1
Diffstat (limited to 'misc.h')
-rw-r--r--misc.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/misc.h b/misc.h
index 434e06c01..01432ba8b 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.55 2016/03/02 22:42:40 dtucker Exp $ */ 1/* $OpenBSD: misc.h,v 1.56 2016/04/06 06:42:17 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -27,6 +27,8 @@ struct Forward {
27 int handle; /* Handle for dynamic listen ports */ 27 int handle; /* Handle for dynamic listen ports */
28}; 28};
29 29
30int forward_equals(const struct Forward *, const struct Forward *);
31
30/* Common server and client forwarding options. */ 32/* Common server and client forwarding options. */
31struct ForwardOptions { 33struct ForwardOptions {
32 int gateway_ports; /* Allow remote connects to forwarded ports. */ 34 int gateway_ports; /* Allow remote connects to forwarded ports. */