summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/conf.c2
-rw-r--r--conf/conf.h1
-rw-r--r--conf/confbase.Y2
3 files changed, 0 insertions, 5 deletions
diff --git a/conf/conf.c b/conf/conf.c
index 9eea5664..f66e3561 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -135,7 +135,6 @@ config_parse(struct config *c)
sysdep_preconfig(c);
protos_preconfig(c);
rt_preconfig(c);
-/* roa_preconfig(c); */
cf_parse();
protos_postconfig(c);
if (EMPTY_LIST(c->protos))
@@ -266,7 +265,6 @@ config_do_commit(struct config *c, int type)
force_restart |= global_commit(c, old_config);
DBG("rt_commit\n");
rt_commit(c, old_config);
-/* roa_commit(c, old_config); */
DBG("protos_commit\n");
protos_commit(c, old_config, force_restart, type);
diff --git a/conf/conf.h b/conf/conf.h
index d442cdb5..1e142bab 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -20,7 +20,6 @@ struct config {
linpool *mem; /* Linear pool containing configuration data */
list protos; /* Configured protocol instances (struct proto_config) */
list tables; /* Configured routing tables (struct rtable_config) */
- list roa_tables; /* Configured ROA tables (struct roa_table_config) */
list logfiles; /* Configured log fils (sysdep) */
int mrtdump_file; /* Configured MRTDump file (sysdep, fd in unix) */
diff --git a/conf/confbase.Y b/conf/confbase.Y
index b25cf2d0..3e8b84b0 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -54,11 +54,9 @@ CF_DECLS
struct f_path_mask *h;
struct password_item *p;
struct rt_show_data *ra;
- struct roa_show_data *ro;
struct sym_show_data *sd;
struct lsadb_show_data *ld;
struct iface *iface;
- struct roa_table *rot;
void *g;
bird_clock_t time;
struct f_prefix px;