From 7057761c79adfde08e0edb5496fd911715b6788e Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Thu, 13 Mar 2014 02:42:42 -0500 Subject: use xmlrpcbaseurl here too, not product_website --- etc/inc/pfsense-utils.inc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'etc/inc') diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 77c1479..065b1e3 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -666,12 +666,14 @@ function rmdir_recursive($path,$follow_links=false) { function call_pfsense_method($method, $params, $timeout = 0) { global $g, $config; - $ip = gethostbyname($g['xmlrpcbaseurl']); - if($ip == $g['xmlrpcbaseurl']) - return false; - $xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl']; $xmlrpc_path = $g['xmlrpcpath']; + + $xmlrpcfqdn = preg_replace("(https?://)", "", $xmlrpc_base_url); + $ip = gethostbyname($xmlrpcfqdn); + if($ip == $xmlrpcfqdn) + return false; + $msg = new XML_RPC_Message($method, array(XML_RPC_Encode($params))); $port = 0; $proxyurl = ""; @@ -711,9 +713,11 @@ function call_pfsense_method($method, $params, $timeout = 0) { */ function check_firmware_version($tocheck = "all", $return_php = true) { global $g, $config; - - $ip = gethostbyname($g['product_website']); - if($ip == $g['product_website']) + + $xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl']; + $xmlrpcfqdn = preg_replace("(https?://)", "", $xmlrpc_base_url); + $ip = gethostbyname($xmlrpcfqdn); + if($ip == $xmlrpcfqdn) return false; $rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))), -- cgit v1.1