diff options
| author |   reyk <reyk@openbsd.org> | 2007-11-20 17:08:44 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2007-11-20 17:08:44 +0000 |
| commit | 59a200f98773dcf42ed42a03bd8c80dc31d8c8cc (patch) | |
| tree | 6795e34010bb0579b3aad5da2f1e6917d682e15d | |
| parent | it may be desirable to send a HTTP error page with error code and a (diff) | |
| download | wireguard-openbsd-59a200f98773dcf42ed42a03bd8c80dc31d8c8cc.tar.xz wireguard-openbsd-59a200f98773dcf42ed42a03bd8c80dc31d8c8cc.zip | |
allow to use the "include" directive in tables, services, relays, and
protocols.
ok pyr@
| -rw-r--r-- | usr.sbin/hoststated/parse.y | 6 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index 4be6e44b47d..ab4c572e476 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.86 2007/11/20 15:54:55 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.87 2007/11/20 17:08:44 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -429,6 +429,7 @@ serviceoptsl : TABLE STRING dstport { } free($2); } + | include ; table : TABLE STRING { @@ -603,6 +604,7 @@ tableoptsl : host { } table->conf.skip_cnt = ($2 / conf->interval.tv_sec) - 1; } + | include ; proto : PROTO STRING { @@ -748,6 +750,7 @@ protoptsl : SSL sslflags bzero(&node, sizeof(node)); } + | include ; direction : /* empty */ { $$ = RELAY_DIR_REQUEST; } @@ -1117,6 +1120,7 @@ relayoptsl : LISTEN ON STRING port optssl { } } | DISABLE { rlay->conf.flags |= F_DISABLE; } + | include ; dstmode : /* empty */ { $$ = RELAY_DSTMODE_DEFAULT; } diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 4be6e44b47d..ab4c572e476 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.86 2007/11/20 15:54:55 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.87 2007/11/20 17:08:44 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -429,6 +429,7 @@ serviceoptsl : TABLE STRING dstport { } free($2); } + | include ; table : TABLE STRING { @@ -603,6 +604,7 @@ tableoptsl : host { } table->conf.skip_cnt = ($2 / conf->interval.tv_sec) - 1; } + | include ; proto : PROTO STRING { @@ -748,6 +750,7 @@ protoptsl : SSL sslflags bzero(&node, sizeof(node)); } + | include ; direction : /* empty */ { $$ = RELAY_DIR_REQUEST; } @@ -1117,6 +1120,7 @@ relayoptsl : LISTEN ON STRING port optssl { } } | DISABLE { rlay->conf.flags |= F_DISABLE; } + | include ; dstmode : /* empty */ { $$ = RELAY_DSTMODE_DEFAULT; } |