From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 5 Apr 2017 16:49:17 +0000 (-0400)
Subject: Merge branch 'master' into pim_5549
X-Git-Tag: reindent-master-before~222^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=096398104b4c223d7f6a90cae632a1b418799517;p=mirror%2Ffrr.git

Merge branch 'master' into pim_5549
---

096398104b4c223d7f6a90cae632a1b418799517
diff --cc pimd/pimd.c
index e76e202bd3,bdbd251e20..3d3f4d6aee
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@@ -108,10 -108,14 +108,17 @@@ pim_vrf_enable (struct vrf *vrf
      {
        pimg = pim_instance_init (VRF_DEFAULT, AFI_IP);
        if (pimg == NULL)
-         zlog_err ("%s %s: pim class init failure ", __FILE__,
-               __PRETTY_FUNCTION__);
+         {
+           zlog_err ("%s %s: pim class init failure ", __FILE__,
+                     __PRETTY_FUNCTION__);
+           /*
+            * We will crash and burn otherwise
+            */
+           exit(1);
 -        }
++      }
++
++    pimg->send_v6_secondary = 1;
 +
-       pimg->send_v6_secondary = 1;
      }
    return 0;
  }