summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-07-29 15:50:17 -0400
committerjim-p <jimp@pfsense.org>2015-07-29 15:50:52 -0400
commit4379f31869e48e98f73600a166854ab417c3f645 (patch)
treeb3e0f51c5a5ec162541b3a4499d2e2724d2690fd
parent6538d22fcb8068b276585b6cc2b4f7b9b0c58829 (diff)
downloadpfsense-4379f31869e48e98f73600a166854ab417c3f645.zip
pfsense-4379f31869e48e98f73600a166854ab417c3f645.tar.gz
Check both greater and less than for the configuration version in XMLRPC sync. Fixes #4902
-rwxr-xr-xetc/rc.filter_synchronize7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index 8c97514..85befde 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -130,9 +130,10 @@ function carp_check_version($url, $username, $password, $port = 80, $method = 'p
}
} else {
if (!isset($parsed_response['config_version']) ||
- $parsed_response['config_version'] < $config['version']) {
- update_filter_reload_status("The other member is on older configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
- log_error("The other member is on older configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
+ ($parsed_response['config_version'] < $config['version']) ||
+ ($parsed_response['config_version'] > $config['version'])) {
+ update_filter_reload_status("The other member is on a different configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
+ log_error("The other member is on a different configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
return false;
} else {
return true;
OpenPOWER on IntegriCloud