Merge branch 'master' into int-new

diff --cc conf/cf-lex.l
Simple merge

diff --cc conf/conf.c
index cc5d5115463297582f80d7537667b2b773711b36,825a8e9f161e3861e7e15d016ef5e914237131c4..1bb744c34ad499f22dd16ca209c862ea1136e334
--- 1/conf/conf.c
--- 2/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 lib/ip.c
Simple merge

diff --cc lib/ip.h
Simple merge

diff --cc nest/rt-table.c
index 88c6883ac5793bf3c8090b9ba8d0296af922e14c,57c8b8e08a7d8cdc17335c7ce26be3c4eadc7858..0a148f454a20151ad5f9f6ccbc2127a92dd4d8ed
--- 1/nest/rt-table.c
--- 2/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);
  }
  
  

diff --cc proto/ospf/packet.c
Simple merge

diff --cc proto/rip/packets.c
Simple merge

diff --cc sysdep/linux/netlink.c
Simple merge

diff --cc sysdep/unix/krt.c
Simple merge