summaryrefslogtreecommitdiff
path: root/usr.sbin/ospf6d/parse.y
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-10-11 19:02:48 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-10-11 19:02:48 +0000
commitdeb1254f305c711065855299168d55d33b866098 (patch)
tree1fa060d968a5621c7675df28433805cb21ea1bb2 /usr.sbin/ospf6d/parse.y
parentc21299fb858339f872a81938f9e140b59c1f620d (diff)
From ospfd:
Bye bye global ospf options. OSPF options are per area (at least the one flag that we set). So introduce a area_ospf_options() function that will return the correct flags for each area. This makes stub area support a lot easier. Don't check for OSPF_OPTION_E in the parent. OSPF_OPTION_E is per area and so the parent process has no way to know if it should redistribute or not.
Diffstat (limited to 'usr.sbin/ospf6d/parse.y')
-rw-r--r--usr.sbin/ospf6d/parse.y3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y
index fee8e559749..79abf355f27 100644
--- a/usr.sbin/ospf6d/parse.y
+++ b/usr.sbin/ospf6d/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.3 2007/10/11 14:39:17 deraadt Exp $ */
+/* $OpenBSD: parse.y,v 1.4 2007/10/11 19:02:47 claudio Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -844,7 +844,6 @@ parse_config(char *filename, int opts)
defs->metric = DEFAULT_METRIC;
defs->priority = DEFAULT_PRIORITY;
- conf->options = OSPF_OPTION_E;
conf->spf_delay = DEFAULT_SPF_DELAY;
conf->spf_hold_time = DEFAULT_SPF_HOLDTIME;
conf->spf_state = SPF_IDLE;