diff options
| author | Ermal <eri@pfsense.org> | 2013-06-12 17:46:12 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-06-12 17:46:12 +0000 |
| commit | fb0eb20bb937d812b8d66605e22c1e3742cabf58 (patch) | |
| tree | 159e928bd362cfff0ad401139e48ddf6ed649a74 /usr/local/www/xmlrpc.php | |
| parent | 1f36db1b7796d993082e93038e52a710878dd9c3 (diff) | |
| download | pfsense-fb0eb20bb937d812b8d66605e22c1e3742cabf58.zip pfsense-fb0eb20bb937d812b8d66605e22c1e3742cabf58.tar.gz | |
Actually do not allow the loop to continue. Related to Ticket #1928
Diffstat (limited to 'usr/local/www/xmlrpc.php')
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 535f6ee..0cb8d51 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -142,8 +142,10 @@ $backup_config_section_sig = array( function backup_config_section_xmlrpc($raw_params) { global $config, $xmlrpc_g; - if (xmlrpc_loop_detect()) + if (xmlrpc_loop_detect()) { log_error("Disallowing CARP sync loop"); + return; + } $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) { @@ -170,8 +172,10 @@ function restore_config_section_xmlrpc($raw_params) { $old_config = $config; - if (xmlrpc_loop_detect()) + if (xmlrpc_loop_detect()) { log_error("Disallowing CARP sync loop"); + return; + } $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) { @@ -295,8 +299,10 @@ $merge_config_section_sig = array( function merge_installedpackages_section_xmlrpc($raw_params) { global $config, $xmlrpc_g; - if (xmlrpc_loop_detect()) + if (xmlrpc_loop_detect()) { log_error("Disallowing CARP sync loop"); + return; + } $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) { @@ -323,8 +329,10 @@ $merge_config_section_sig = array( function merge_config_section_xmlrpc($raw_params) { global $config, $xmlrpc_g; - if (xmlrpc_loop_detect()) + if (xmlrpc_loop_detect()) { log_error("Disallowing CARP sync loop"); + return; + } $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) { @@ -380,8 +388,10 @@ $carp_configure_sig = array( function interfaces_carp_configure_xmlrpc($raw_params) { global $xmlrpc_g; - if (xmlrpc_loop_detect()) + if (xmlrpc_loop_detect()) { log_error("Disallowing CARP sync loop"); + return; + } $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) { |
