diff options
author | Renato Botelho <renato@netgate.com> | 2017-07-05 13:21:56 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-07-05 13:21:56 -0300 |
commit | 2bf67a6fe9e507e442f6894c78726047cf2d552a (patch) | |
tree | 379d52898dd040c20fa05f6402472b65e84ea080 /src/etc | |
parent | d49ad309f9006440cb81f5c8ff8990bf9325a92b (diff) | |
download | pfsense-2bf67a6fe9e507e442f6894c78726047cf2d552a.zip pfsense-2bf67a6fe9e507e442f6894c78726047cf2d552a.tar.gz |
Send uniqueid instead of UUID on user-agent
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/pfsense-utils.inc | 8 | ||||
-rw-r--r-- | src/etc/inc/pkg-utils.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index c0a083b..2ec4e7e 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1947,8 +1947,8 @@ function download_file($url, $destination, $verify_ssl = true, $connect_timeout curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - if (!isset($config['system']['do_not_send_host_uuid'])) { - curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . get_single_sysctl('kern.hostuuid')); + if (!isset($config['system']['do_not_send_uniqueid'])) { + curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid()); } else { curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); } @@ -2003,8 +2003,8 @@ function download_file_with_progress_bar($url, $destination, $verify_ssl = true, curl_setopt($ch, CURLOPT_NOPROGRESS, '1'); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $connect_timeout); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); - if (!isset($config['system']['do_not_send_host_uuid'])) { - curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . get_single_sysctl('kern.hostuuid')); + if (!isset($config['system']['do_not_send_uniqueid'])) { + curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid()); } else { curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); } diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 9d78f71..b88082f 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -78,8 +78,8 @@ function pkg_env($extra_env = array()) { global $config, $g; $user_agent = $g['product_name'] . '/' . $g['product_version']; - if (!isset($config['system']['do_not_send_host_uuid'])) { - $user_agent .= ' : ' . get_single_sysctl('kern.hostuuid'); + if (!isset($config['system']['do_not_send_uniqueid'])) { + $user_agent .= ' : ' . system_get_uniqueid(); } $pkg_env_vars = array( |