Merge pull request #280 from donaldsharp/more_pim

More pim

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_rp.c
index 5155354625392aebc7635cb01e70a0c5b46a598d,de30116ed490c41b2cd057554181626ffeabb891..6c83811d9af1dc419251cf54d627d1553de99246
--- 1/pimd/pim_rp.c
--- 2/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@@ -752,9 -785,9 +785,9 @@@ pim_rp_check_is_my_ip_address (struct i
         return 1;
      }
  
 -  if (if_lookup_exact_address (&dest_addr, AF_INET))
 +  if (if_lookup_exact_address (&dest_addr, AF_INET, VRF_DEFAULT))
      return 1;
-     
+ 
    return 0;
  }
  

diff --cc pimd/pim_rpf.c
Simple merge

diff --cc pimd/pim_zebra.c
Simple merge