Commit fb059fa7 authored by Ad Schellevis's avatar Ad Schellevis

(legacy) hasync issue with virtual ip aliases

parent 29dc0b5e
...@@ -264,7 +264,7 @@ function restore_config_section_xmlrpc($new_config) ...@@ -264,7 +264,7 @@ function restore_config_section_xmlrpc($new_config)
$vipbackup = array(); $vipbackup = array();
$oldvips = array(); $oldvips = array();
if (isset($config['virtualip']['vip'])) { if (isset($new_config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vipindex => $vip) { foreach ($config['virtualip']['vip'] as $vipindex => $vip) {
if ($vip['mode'] == "carp") { if ($vip['mode'] == "carp") {
$oldvips["{$vip['interface']}_vip{$vip['vhid']}"] = "{$vip['password']}{$vip['advskew']}{$vip['subnet']}{$vip['subnet_bits']}{$vip['advbase']}"; $oldvips["{$vip['interface']}_vip{$vip['vhid']}"] = "{$vip['password']}{$vip['advskew']}{$vip['subnet']}{$vip['subnet_bits']}{$vip['advbase']}";
...@@ -280,7 +280,7 @@ function restore_config_section_xmlrpc($new_config) ...@@ -280,7 +280,7 @@ function restore_config_section_xmlrpc($new_config)
$config = array_merge_recursive_unique($config, $new_config); $config = array_merge_recursive_unique($config, $new_config);
/* Then add ipalias and proxyarp types already defined on the backup */ /* Then add ipalias and proxyarp types already defined on the backup */
if (is_array($vipbackup) && !empty($vipbackup)) { if (count($vipbackup) > 0) {
if (!isset($config['virtualip'])) { if (!isset($config['virtualip'])) {
$config['virtualip'] = array(); $config['virtualip'] = array();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment