diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-01-15 20:17:46 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-01-15 20:17:46 +0100 |
| commit | 89f171b052fbe72aed654d2a1c3d5a24e9bf9902 (patch) | |
| tree | 88099045c1b9056bd469f156c28e0015c811980e /usr/local/www/xmlrpc.php | |
| parent | 98bf4991dc31f97fc7315a6b8aba433de9d39cea (diff) | |
| download | pfsense-89f171b052fbe72aed654d2a1c3d5a24e9bf9902.zip pfsense-89f171b052fbe72aed654d2a1c3d5a24e9bf9902.tar.gz | |
Ticket #3997, teach code to track carp through uniqids(). Missing carp GUI changes and upgrade code
Diffstat (limited to 'usr/local/www/xmlrpc.php')
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 2f2d944..49fad44 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -213,9 +213,9 @@ function restore_config_section_xmlrpc($raw_params) { foreach ($config['virtualip']['vip'] as $vipindex => $vip) { if ($vip['mode'] == "carp") $oldvips["{$vip['interface']}_vip{$vip['vhid']}"] = "{$vip['password']}{$vip['advskew']}{$vip['subnet']}{$vip['subnet_bits']}{$vip['advbase']}"; - else if ($vip['mode'] == "ipalias" && (strstr($vip['interface'], "_vip") || strstr($vip['interface'], "lo0"))) + else if ($vip['mode'] == "ipalias" && (substr($vip['interface'], 0, 4) == '_vip') || strpos($vip['interface'], "lo0"))) $oldvips[$vip['subnet']] = "{$vip['interface']}{$vip['subnet']}{$vip['subnet_bits']}"; - else if (($vip['mode'] == "ipalias" || $vip['mode'] == 'proxyarp') && !(strstr($vip['interface'], "_vip") || strstr($vip['interface'], "lo0"))) + else if (($vip['mode'] == "ipalias" || $vip['mode'] == 'proxyarp') && !(substr($vip['interface'], 0, 4) == '_vip') || strpos($vip['interface'], "lo0"))) $vipbackup[] = $vip; } } |
