diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-12-15 17:16:48 -0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-15 17:16:48 -0200 |
commit | c25caf5b01269961d0129f8f83dc8dc1a078c3a8 (patch) | |
tree | 4a7660267d264fa853aa21653621473bf926bb13 /usr/local/www/xmlrpc.php | |
parent | fa2122b02af3731ac09c4acd320c8b56f9e6e029 (diff) | |
download | pfsense-c25caf5b01269961d0129f8f83dc8dc1a078c3a8.zip pfsense-c25caf5b01269961d0129f8f83dc8dc1a078c3a8.tar.gz |
Add DNS Resolver to the list of services to be sync'd on HA, make sure it and DNS Forwarder are not enabled simultaneously. It fixes #4067
Diffstat (limited to 'usr/local/www/xmlrpc.php')
-rwxr-xr-x | usr/local/www/xmlrpc.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index a44789d..88dc537 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -211,6 +211,18 @@ function restore_config_section_xmlrpc($raw_params) { } } + /* + * Make sure it doesn't end up with both dnsmasq and unbound enabled + * simultaneously in secondary + * */ + if (isset($params[0]['unbound']['enable']) && isset($config['dnsmasq']['enable'])) { + unset($config['dnsmasq']['enable']); + services_dnsmasq_configure(); + } else if (isset($params[0]['dnsmasq']['enable']) && isset($config['unbound']['enable'])) { + unset($config['unbound']['enable']); + services_unbound_configure(); + } + // For vip section, first keep items sent from the master $config = array_merge_recursive_unique($config, $params[0]); |