diff options
author | Ermal LUÇI <eri@pfsense.org> | 2015-02-11 20:26:48 +0100 |
---|---|---|
committer | Ermal LUÇI <eri@pfsense.org> | 2015-02-11 20:26:48 +0100 |
commit | 2de650f6117f4b80c3db4f9b46ad83d75d5b9130 (patch) | |
tree | 78639df58cdc5ea5a411be9ce54b276f4adb5f74 /etc/inc/interfaces.inc | |
parent | 302cb96e7b4eb0515f406d69d7911dbca61cbee7 (diff) | |
download | pfsense-2de650f6117f4b80c3db4f9b46ad83d75d5b9130.zip pfsense-2de650f6117f4b80c3db4f9b46ad83d75d5b9130.tar.gz |
Fixes #4389 The VIP interfaces cannot be assigned since they are just an identification of the VIP for tracking. Consider that when configuring gif/gre. Also on bridges you cannot set a vip interface as its member.
Diffstat (limited to 'etc/inc/interfaces.inc')
-rw-r--r-- | etc/inc/interfaces.inc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 7903f6a..88bdeff 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -421,8 +421,6 @@ function interfaces_bridge_configure($checkmember = 0, $realif = "") { } } else if ($checkmember == 2) { - if (!strstr($bridge['if'], "_vip")) - continue; $members = explode(',', $bridge['members']); foreach ($members as $member) { if (empty($config['interfaces'][$bridge['if']]) || $config['interfaces'][$bridge['if']]['ipaddrv6'] != "track6") @@ -725,9 +723,7 @@ function interfaces_gre_configure($checkparent = 0, $realif = "") { continue; } else if ($checkparent == 2) { - if (!strstr($gre['if'], "_vip")) - continue; - if (empty($config['interfaces'][$gre['if']]) || $config['interfaces'][$gre['if']]['ipaddrv6'] != "track6") + if (!strstr($gre['if'], "_vip") && (empty($config['interfaces'][$gre['if']]) || $config['interfaces'][$gre['if']]['ipaddrv6'] != "track6")) continue; } /* XXX: Maybe we should report any errors?! */ @@ -806,9 +802,7 @@ function interfaces_gif_configure($checkparent = 0, $realif = "") { continue; } else if ($checkparent == 2) { - if (!strstr($gif['if'], "_vip")) - continue; - if (empty($config['interfaces'][$gif['if']]) || $config['interfaces'][$gif['if']]['ipaddrv6'] != "track6") + if (!strstr($gif['if'], "_vip") && (empty($config['interfaces'][$gif['if']]) || $config['interfaces'][$gif['if']]['ipaddrv6'] != "track6")) continue; } /* XXX: Maybe we should report any errors?! */ |