Merge remote-tracking branch 'origin/stable/2.0'

cumulus/start-stop-daemon.c

@@ -811,6 +811,7 @@ run_stop_schedule(void)
 
 	anykilled = 0;
 	retry_nr = 0;
+	n_killed = 0;
 
 	if (schedule == NULL) {
 		do_stop(signal_nr, quietmode, &n_killed, &n_notkilled, 0);

doc/Building_FRR_on_Ubuntu1204.md

@@ -77,6 +77,7 @@ an example.)
     cd frr
     ./bootstrap.sh
     ./configure \
+        --prefix=/usr \
         --enable-exampledir=/usr/share/doc/frr/examples/ \
         --localstatedir=/var/run/frr \
         --sbindir=/usr/lib/frr \
@@ -130,3 +131,26 @@ other settings)
     net.ipv6.conf.all.forwarding=1
 
 **Reboot** or use `sysctl -p` to apply the same config to the running system
+
+### Install the init.d service
+
+    sudo install -m 755 tools/frr /etc/init.d/frr  
+    sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons    
+    sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf    
+    sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf 
+    
+### Enable daemons 
+Edit `/etc/frr/daemons` and change the value from "no" to "yes" for those daemons you want to start by systemd.  
+For example.
+
+    zebra=yes  
+    bgpd=yes  
+    ospfd=yes  
+    ospf6d=yes  
+    ripd=yes  
+    ripngd=yes  
+    isisd=yes 
+    
+### Start the init.d service
+- /etc/init.d/frr start
+- use `/etc/init.d/frr status` to check its status.

doc/Building_FRR_on_Ubuntu1404.md

@@ -37,6 +37,7 @@ an example.)
     cd frr
     ./bootstrap.sh
     ./configure \
+        --prefix=/usr \
         --enable-exampledir=/usr/share/doc/frr/examples/ \
         --localstatedir=/var/run/frr \
         --sbindir=/usr/lib/frr \
@@ -91,3 +92,29 @@ other settings)
     net.ipv6.conf.all.forwarding=1
 
 **Reboot** or use `sysctl -p` to apply the same config to the running system
+### Install the init.d service
+
+    sudo install -m 755 tools/frr /etc/init.d/frr  
+    sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons    
+    sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf    
+    sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf   
+ 
+ 
+### Enable daemons 
+
+Edit `/etc/frr/daemons` and change the value from "no" to "yes" for those daemons you want to start by systemd.  
+For example.
+
+    zebra=yes  
+    bgpd=yes  
+    ospfd=yes  
+    ospf6d=yes  
+    ripd=yes  
+    ripngd=yes  
+    isisd=yes 
+    
+### Start the init.d service
+- /etc/init.d/frr start
+- use `/etc/init.d/frr status` to check its status.
+    
+ 

ospfd/ospf_apiserver.c

@@ -2459,7 +2459,7 @@ ospf_apiserver_clients_notify_nsm_change (struct ospf_neighbor *nbr)
 {
   struct msg *msg;
   struct in_addr ifaddr = { .s_addr = 0L };
-  struct in_addr nbraddr = { .s_addr = 0L };
+  struct in_addr nbraddr;
 
   assert (nbr);
 

ospfd/ospf_vty.c

@@ -6333,7 +6333,7 @@ DEFUN (no_ip_ospf_dead_interval,
 {
   VTY_DECLVAR_CONTEXT(interface, ifp);
   int idx_ipv4 = argc - 1;
-  struct in_addr addr;
+  struct in_addr addr = { .s_addr = 0L};
   int ret;
   struct ospf_if_params *params;
   struct ospf_interface *oi;
@@ -6465,6 +6465,7 @@ DEFUN (no_ip_ospf_hello_interval,
   int idx = 0;
   struct in_addr addr;
   struct ospf_if_params *params;
+
   params = IF_DEF_PARAMS (ifp);
 
   if (argv_find (argv, argc, "A.B.C.D", &idx))