diff options
| author | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2012-01-20 12:16:42 +0000 |
|---|---|---|
| committer | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2012-01-20 12:16:42 +0000 |
| commit | 2eb255caf18bb2cfcba19420aa076c378c8d9e5f (patch) | |
| tree | 4f9833c4bfb0853f50dd591258c6491ee59e21ef | |
| parent | ff4e3651824dd4d7ac0cdca53766b0c17208d7ec (diff) | |
Remove global carp demote option. It is currently broken, but also flawed
by design.
ok henning pyr
| -rw-r--r-- | usr.sbin/relayd/parse.y | 20 | ||||
| -rw-r--r-- | usr.sbin/relayd/relayd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/relayd/relayd.conf.5 | 15 |
3 files changed, 4 insertions, 35 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index a98b6eceec5..37fa0da61e1 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.159 2011/09/21 18:45:40 bluhm Exp $ */ +/* $OpenBSD: parse.y,v 1.160 2012/01/20 12:16:41 camield Exp $ */ /* * Copyright (c) 2007-2011 Reyk Floeter <reyk@openbsd.org> @@ -365,24 +365,6 @@ main : INTERVAL NUMBER { } conf->sc_prefork_relay = $2; } - | DEMOTE STRING { - if (loadcfg) - break; - conf->sc_flags |= F_DEMOTE; - if (strlcpy(conf->sc_demote_group, $2, - sizeof(conf->sc_demote_group)) - >= sizeof(conf->sc_demote_group)) { - yyerror("yyparse: demote group name too long"); - free($2); - YYERROR; - } - free($2); - if (carp_demote_init(conf->sc_demote_group, 1) == -1) { - yyerror("yyparse: error initializing group %s", - conf->sc_demote_group); - YYERROR; - } - } | SEND TRAP { if (loadcfg) break; diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c index 0fefd0c5781..a3f8fea6397 100644 --- a/usr.sbin/relayd/relayd.c +++ b/usr.sbin/relayd/relayd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.c,v 1.104 2011/09/04 20:26:58 bluhm Exp $ */ +/* $OpenBSD: relayd.c,v 1.105 2012/01/20 12:16:41 camield Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -361,8 +361,6 @@ parent_shutdown(struct relayd *env) proc_kill(env->sc_ps); control_cleanup(&env->sc_ps->ps_csock); carp_demote_shutdown(); - if (env->sc_flags & F_DEMOTE) - carp_demote_reset(env->sc_demote_group, 128); free(env->sc_ps); free(env); diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5 index 676463ab868..e7d3814ce54 100644 --- a/usr.sbin/relayd/relayd.conf.5 +++ b/usr.sbin/relayd/relayd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: relayd.conf.5,v 1.124 2011/06/24 14:42:36 jmc Exp $ +.\" $OpenBSD: relayd.conf.5,v 1.125 2012/01/20 12:16:41 camield Exp $ .\" .\" Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 24 2011 $ +.Dd $Mdocdate: January 20 2012 $ .Dt RELAYD.CONF 5 .Os .Sh NAME @@ -115,17 +115,6 @@ table \*(Ltwebhosts\*(Gt { .Sh GLOBAL CONFIGURATION Here are the settings that can be set globally: .Bl -tag -width Ds -.It Ic demote Ar group -Enable the global -.Xr carp 4 -demotion option, resetting the carp demotion counter for the -specified interface group to zero on startup and to 128 on shutdown of -the daemon. -For more information on interface groups, -see the -.Ic group -keyword in -.Xr ifconfig 8 . .It Ic interval Ar number Set the interval in seconds at which the hosts will be checked. The default interval is 10 seconds. |