diff options
| author | jim-p <jimp@pfsense.org> | 2013-09-10 11:08:02 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-09-10 11:08:02 -0400 |
| commit | b832d61759dea24e995865c00bcbc241cb6affcd (patch) | |
| tree | 0c475fa530f351c1f707749ed78b6ca2dba6253d | |
| parent | a3d6166bb20a3ff4d6a7ff57290c3e59ce51ded4 (diff) | |
| download | pfsense-b832d61759dea24e995865c00bcbc241cb6affcd.zip pfsense-b832d61759dea24e995865c00bcbc241cb6affcd.tar.gz | |
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.
| -rw-r--r-- | etc/inc/services.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index a6db67c..21c2989 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; |
