summaryrefslogtreecommitdiff
path: root/conf/conf.c
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2015-11-05 12:48:52 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2015-11-05 12:48:52 +0100
commitfe9f1a6dedda6bab23cbb605d1cd5db6cd3e2468 (patch)
treed6ea417b7ed16c90b29634fe075e51508dec87d9 /conf/conf.c
parent8eb8e546dc8cc647fcfa4a3a17dfa8ab36b00958 (diff)
Initial commit on integrated BIRD
New data types net_addr and variants (in lib/net.h) describing network addresses (prefix/pxlen). Modifications of FIB structures to handle these data types and changing everything to use these data types instead of prefix/pxlen pairs where possible. The commit is WiP, some protocols are not yet updated (BGP, Kernel), and the code contains some temporary scaffolding. Comments are welcome.
Diffstat (limited to 'conf/conf.c')
-rw-r--r--conf/conf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/conf.c b/conf/conf.c
index a907402d..cc5d5115 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -133,10 +133,10 @@ config_parse(struct config *c)
protos_postconfig(c);
if (EMPTY_LIST(c->protos))
cf_error("No protocol is specified in the config file");
-#ifdef IPV6
+ /* XXXX */
if (!c->router_id)
- cf_error("Router ID must be configured manually on IPv6 routers");
-#endif
+ cf_error("Router ID must be configured manually");
+
return 1;
}