diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-23 10:40:47 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-23 10:40:47 -0200 |
| commit | 3138b2e38c0e8ea529c58d76d91bb88e830a6daa (patch) | |
| tree | 6dc0e22c91de19fbc1681b4fd871ae03a6f9311c /src/etc | |
| parent | 0c310d6730a0a78dcfb4dc4c06199fae1112a637 (diff) | |
| download | pfsense-3138b2e38c0e8ea529c58d76d91bb88e830a6daa.zip pfsense-3138b2e38c0e8ea529c58d76d91bb88e830a6daa.tar.gz | |
Use new host_uuid option name when changing User-Agent
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 4 | ||||
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 54b33da..08ef436 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1635,7 +1635,7 @@ 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']['host_uuid'])) { + 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')); } else { curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); @@ -1681,7 +1681,7 @@ function download_file_with_progress_bar($url_file, $destination_file, $readbody curl_setopt($ch, CURLOPT_NOPROGRESS, '1'); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $connect_timeout); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); - if (!isset($config['system']['host_uuid'])) { + 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')); } 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 8c67e9f..08e7bf0 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -136,7 +136,7 @@ function pkg_call($params, $mute = false) { } $user_agent = $g['product_name'] . '/' . $g['product_version']; - if (!isset($config['system']['host_uuid'])) { + if (!isset($config['system']['do_not_send_host_uuid'])) { $user_agent .= ' : ' . get_single_sysctl('kern.hostuuid'); } @@ -234,7 +234,7 @@ function pkg_exec($params, &$stdout, &$stderr) { } $user_agent = $g['product_name'] . '/' . $g['product_version']; - if (!isset($config['system']['host_uuid'])) { + if (!isset($config['system']['do_not_send_host_uuid'])) { $user_agent .= ' : ' . get_single_sysctl('kern.hostuuid'); } |
