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

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

diff --cc pimd/pimd.c
index e8960916a9a9358ed71770130361324e35cea1c0,c9fd4d85f2669d02c7f3b0ab618745ef1abca7c5..2316cd08f565e8f09e80838049a1e895549a2fa8
--- 1/pimd/pimd.c
--- 2/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()