From 150d479bc5bf78a6b739bb5bf935b4698f6de5bd Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Thu, 22 Jan 2015 09:00:54 -0200
Subject: [PATCH] When configuring radvd, check if carp is enabled. Ticket
 #4252

---
 etc/inc/services.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 6fbc69a41c..079413c469 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -96,8 +96,8 @@ function services_radvd_configure($blacklist = array()) {
 		}
 
 		if (strstr($dhcpv6if, "_vip")) {
-			// CARP IP, find parent
-			if (get_carp_interface_status($dhcpv6if) != "MASTER")
+			// CARP IP, check if it's enabled and find parent
+			if (!get_carp_status() || get_carp_interface_status($dhcpv6if) != "MASTER")
 				continue;
 			$ifparent = link_carp_interface_to_parent($dhcpv6if);
 			$realif = convert_friendly_interface_to_real_interface_name($ifparent);