From b832d61759dea24e995865c00bcbc241cb6affcd Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 10 Sep 2013 11:08:02 -0400 Subject: [PATCH] This broke correct detection of primary/secondary -- the person in that thread may have had some other config issue, but this broke working/valid configurations. Revert "Correct check to match the right vip based on configured ip. Reported-by: http://forum.pfsense.org/index.php/topic,66234.0.html" This reverts commit 25f9f3322863eae12f705137d8d414643d7b853f. --- etc/inc/services.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/inc/services.inc b/etc/inc/services.inc index a6db67c57e..21c2989d38 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -448,9 +448,10 @@ EOD; * does it match up to a defined vip? */ $skew = 110; - if(is_array($config['virtualip']['vip'])) { - foreach ($config['virtualip']['vip'] as $vipent) { - if($vipent['subnet'] == $intip) { + $a_vip = &$config['virtualip']['vip']; + if(is_array($a_vip)) { + foreach ($a_vip as $vipent) { + if($int == $real_dhcpif) { /* this is the interface! */ if(is_numeric($vipent['advskew']) && ($vipent['advskew'] < "20")) $skew = 0;