diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:54:45 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:54:45 -0300 |
commit | f16ba51e6de4e3760d49a3e1e82a41e809bf9d09 (patch) | |
tree | 4856af8615fbcd40013b11f7e33cc391e109c39c /usr/local/www/xmlrpc.php | |
parent | 97fc77679d3b269803d7d7cdcec941cc42ee1694 (diff) | |
parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
download | pfsense-f16ba51e6de4e3760d49a3e1e82a41e809bf9d09.zip pfsense-f16ba51e6de4e3760d49a3e1e82a41e809bf9d09.tar.gz |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/services_dhcp_edit.php
Diffstat (limited to 'usr/local/www/xmlrpc.php')
-rwxr-xr-x | usr/local/www/xmlrpc.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index a1b9ec5..950469c 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -202,7 +202,7 @@ function merge_config_section_xmlrpc($raw_params) { global $config, $xmlrpc_g; $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail']; - $config = array_merge($config, $params[0]); + $config = array_merge_recursive_unique($config, $params[0]); $mergedkeys = implode(",", array_keys($params[0])); write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client."); return $xmlrpc_g['return']['true']; @@ -229,6 +229,8 @@ function filter_configure_xmlrpc($raw_params) { require_once("openvpn.inc"); openvpn_resync_all(); services_dhcpd_configure(); + services_dnsmasq_configure(); + local_sync_accounts(); return $xmlrpc_g['return']['true']; } |