From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 31 Jan 2017 14:26:07 +0000 (+0100)
Subject: Merge branch 'frr/pull/133' ("Pim cleanup")
X-Git-Tag: frr-3.0-branchpoint~60
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=26df3a33ae91edfdb5b69817050f773c430001ff;p=mirror%2Ffrr.git

Merge branch 'frr/pull/133' ("Pim cleanup")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

26df3a33ae91edfdb5b69817050f773c430001ff
diff --cc pimd/pimd.c
index e8960916a9,c9fd4d85f2..2316cd08f5
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@@ -87,10 -86,15 +86,14 @@@ static void pim_free(
    if (qpim_static_route_list)
       list_free(qpim_static_route_list);
  
 -  pim_route_map_terminate();
 -
    pim_if_terminate ();
    pim_rp_free ();
 +
    pim_route_map_terminate();
+ 
+   zclient_lookup_free ();
+ 
+   zprivs_terminate(&pimd_privs);
  }
  
  void pim_init()