1 files changed, 3 insertions, 56 deletions
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index 13d0c5eb1a3a..92b510244ce1 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,15 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2020-07-07 21:58:15 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2020-11-13 06:36:41 UTC
 +++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -16,7 +16,7 @@
- #include <wincred.h>
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
- #include <pwd.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
  #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
  #endif
  
@@ -18,7 +9,7 @@
  #include <limits.h>  // For HOST_NAME_MAX
  #endif
  
-@@ -61,7 +61,7 @@
+@@ -66,7 +66,7 @@
  #include "base/system/sys_info.h"
  #endif
  
@@ -27,47 +18,3 @@
  #include "base/system/sys_info.h"
  #endif
  
-@@ -70,11 +70,24 @@ namespace policy {
- namespace em = enterprise_management;
- 
- std::string GetMachineName() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-   char hostname[HOST_NAME_MAX];
-   if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
-     return hostname;
-   return std::string();
-+#elif defined(OS_BSD)
-+  long host_name_max = sysconf(_SC_HOST_NAME_MAX);
-+  if (host_name_max != -1) {
-+    char *hostname = new char[host_name_max + 1]();
-+    std::string hostname_r;
-+
-+    if (gethostname(hostname, host_name_max) == 0)
-+      hostname_r = hostname;
-+
-+    delete[] hostname;
-+    return hostname_r;
-+  }
-+  return std::string();
- #elif defined(OS_MACOSX)
- // TODO(crbug.com/1024115): Find a different replacement for -[NSHost
- // currentHost] on iOS.
-@@ -124,7 +137,7 @@ std::string GetMachineName() {
- }
- 
- std::string GetOSVersion() {
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-   return base::SysInfo::OperatingSystemVersion();
- #elif defined(OS_WIN)
-   base::win::OSInfo::VersionNumber version_number =
-@@ -147,7 +160,7 @@ std::string GetOSArchitecture() {
- }
- 
- std::string GetOSUsername() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
-   struct passwd* creds = getpwuid(getuid());
-   if (!creds || !creds->pw_name)
-     return std::string();