From fce6a2c3e8ebe02ea2e73fe41f4e968a946a28d9 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Mon, 3 Mar 2008 16:47:29 +0000 Subject: Inherit global table options. From Armin Wolfermann ok pyr@ deraadt@ --- usr.sbin/relayd/parse.y | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'usr.sbin/relayd/parse.y') diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 80144c6c51d..4f759278e20 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.109 2008/02/27 15:36:42 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.110 2008/03/03 16:47:28 reyk Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter @@ -2052,6 +2052,12 @@ table_inherit(struct table *tb) } tb->conf.flags |= dsttb->conf.flags; + /* Inherit global table options */ + bcopy(&dsttb->conf.timeout, &tb->conf.timeout, sizeof(struct timeval)); + tb->conf.skip_cnt = dsttb->conf.skip_cnt; + strlcpy(tb->conf.demote_group, dsttb->conf.demote_group, + sizeof(tb->conf.demote_group)); + /* Copy the associated hosts */ bzero(&tb->hosts, sizeof(tb->hosts)); TAILQ_FOREACH(dsth, &dsttb->hosts, entry) { -- cgit v1.2.3