diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-01-22 09:00:54 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-01-22 09:00:54 -0200 |
| commit | 150d479bc5bf78a6b739bb5bf935b4698f6de5bd (patch) | |
| tree | 6ee4faabb8788cc5972704472cc9f5d2ecf4a582 | |
| parent | 42cc62a2e7bbf1d953a1172578144b4763467c41 (diff) | |
| download | pfsense-150d479bc5bf78a6b739bb5bf935b4698f6de5bd.zip pfsense-150d479bc5bf78a6b739bb5bf935b4698f6de5bd.tar.gz | |
When configuring radvd, check if carp is enabled. Ticket #4252
| -rw-r--r-- | etc/inc/services.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 6fbc69a..079413c 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); |
