diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index c0b8adce5..83d5c08a8 100644 --- a/src/etc/inc/config.inc +++ b/src/etc/inc/config.inc @@ -153,12 +153,6 @@ function write_config($desc = '', $backup = true) } } - if (!isset($config['version'])) { - // Examine config.xml, if for some strange reason the content is unexpected : exit directly. - log_error('WARNING: Corrupt config!'); - return -1; - } - plugins_interfaces(); $cnf = OPNsense\Core\Config::getInstance(); diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc index a9c4f0df5..451115728 100644 --- a/src/etc/inc/xmlrpc/legacy.inc +++ b/src/etc/inc/xmlrpc/legacy.inc @@ -105,13 +105,10 @@ function merge_config_attributes(&$cnf_source, &$cnf_dest) */ function firmware_version_xmlrpc() { - global $config; - return array( 'firmware' => array('version' => file_get_contents('/usr/local/opnsense/version/opnsense')), 'kernel' => array('version' => file_get_contents('/usr/local/opnsense/version/kernel')), 'base' => array('version' => file_get_contents('/usr/local/opnsense/version/base')), - 'config_version' => $config['version'], ); } diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize index 83134fd34..bdb9fdf12 100755 --- a/src/etc/rc.filter_synchronize +++ b/src/etc/rc.filter_synchronize @@ -77,8 +77,6 @@ function get_vip_config_section() */ function carp_check_version($url, $username, $password, $method = 'opnsense.firmware_version') { - global $config; - $client = new SimpleXMLRPC_Client($url,240); $client->setCredentials($username, $password); if ($client->query($method)) { @@ -100,14 +98,7 @@ function carp_check_version($url, $username, $password, $method = 'opnsense.firm return false; } - if (!isset($remote_version['config_version']) || - $remote_version['config_version'] < $config['version']) { - update_filter_reload_status("The other member is on older configuration version. Sync will not be done to prevent problems!"); - log_error("The other member is on older configuration version. Sync will not be done to prevent problems!"); - return false; - } else { - return true; - } + return true; } /** diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php index 20d5267f0..2058d6110 100644 --- a/src/www/diag_confbak.php +++ b/src/www/diag_confbak.php @@ -284,7 +284,6 @@ $( document ).ready(function() {