pimd: Fix another SA issue

pim_zebra.c was checking to see if a ifp pointer was null
in some debug statements.  This caused the SA code
to assume that if we were at this point then the ifp
could be null and subsuquent code that doesn't check
for it to be wrong.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index c6ca5189c176372df0cbdae7670be65823c99533..5472fe3d3aeecf1b12fd8dc57a68d6b5f9301f6a 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -425,8 +425,8 @@ pim_scan_individual_oil (struct channel_oil *c_oil)
       zlog_debug("%s %s: (S,G)=(%s,%s) input interface changed from %s vif_index=%d to %s vif_index=%d",
                 __FILE__, __PRETTY_FUNCTION__,
                 source_str, group_str,
-                old_iif ? old_iif->name : "<old_iif?>", c_oil->oil.mfcc_parent,
-                new_iif ? new_iif->name : "<new_iif?>", input_iface_vif_index);
+                old_iif->name, c_oil->oil.mfcc_parent,
+                new_iif->name, input_iface_vif_index);
     }
 
   /* new iif loops to existing oif ? */
@@ -442,7 +442,7 @@ pim_scan_individual_oil (struct channel_oil *c_oil)
        zlog_debug("%s %s: (S,G)=(%s,%s) new iif loops to existing oif: %s vif_index=%d",
                   __FILE__, __PRETTY_FUNCTION__,
                   source_str, group_str,
-                  new_iif ? new_iif->name : "<new_iif?>", input_iface_vif_index);
+                  new_iif->name, input_iface_vif_index);
       }
 
       del_oif(c_oil, new_iif, PIM_OIF_FLAG_PROTO_ANY);