Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3

Conflicts:
	bgpd/bgp_route.c

1 files changed, 2 insertions, 0 deletions

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 38c2875949..1a7d03bca1 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -100,6 +100,8 @@ sigint (void)
   if (! retain_mode)
     rip_clean ();
 
+  rip_zclient_stop ();
+
   exit (0);
 }