From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 25 Nov 2015 13:24:35 +0000 (+0100)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0-pre0~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04ae8ddaa15b72c265dc7cf038b733d235198754;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

04ae8ddaa15b72c265dc7cf038b733d235198754
diff --cc conf/conf.c
index cc5d51154,825a8e9f1..1bb744c34
--- a/conf/conf.c
+++ b/conf/conf.c
@@@ -133,11 -140,16 +140,16 @@@ 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;
+   done = 1;
+ 
+ cleanup:
+   new_config = NULL;
+   cfg_mem = NULL;
+   return done;
  }
  
  /**
diff --cc nest/rt-table.c
index 88c6883ac,57c8b8e08..0a148f454
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@@ -1652,10 -1657,10 +1652,10 @@@ rt_prune_loop(void
  void
  rt_preconfig(struct config *c)
  {
-   struct symbol *s = cf_find_symbol("master");
+   struct symbol *s = cf_get_symbol("master");
  
    init_list(&c->tables);
 -  c->master_rtc = rt_new_table(s);
 +  c->master_rtc = rt_new_table(s, NET_IP4);
  }