b88b94b93e
Obtained from: freebsd-chromium@ (especially Carlos Medina) MFH: 2014Q3 Security: http://www.vuxml.org/freebsd/fd5f305d-2d3d-11e4-aa3d-00262d5ed8ee.html
44 lines
1.8 KiB
C++
44 lines
1.8 KiB
C++
--- ./chrome/common/chrome_paths.cc.orig 2014-08-20 21:01:56.000000000 +0200
|
|
+++ ./chrome/common/chrome_paths.cc 2014-08-22 15:06:27.000000000 +0200
|
|
@@ -469,10 +469,12 @@
|
|
if (!base::PathExists(cur)) // We don't want to create this
|
|
return false;
|
|
break;
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
case chrome::DIR_POLICY_FILES: {
|
|
#if defined(GOOGLE_CHROME_BUILD)
|
|
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
|
|
+#elif defined(OS_BSD)
|
|
+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
|
|
#else
|
|
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
|
|
#endif
|
|
@@ -550,7 +552,7 @@
|
|
#endif
|
|
break;
|
|
|
|
-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
|
|
+#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
|
|
case chrome::DIR_NATIVE_MESSAGING:
|
|
#if defined(OS_MACOSX)
|
|
#if defined(GOOGLE_CHROME_BUILD)
|
|
@@ -564,6 +566,9 @@
|
|
#if defined(GOOGLE_CHROME_BUILD)
|
|
cur = base::FilePath(FILE_PATH_LITERAL(
|
|
"/etc/opt/chrome/native-messaging-hosts"));
|
|
+#elif defined(OS_BSD)
|
|
+ cur = base::FilePath(FILE_PATH_LITERAL(
|
|
+ "/usr/local/etc/chrome/native-messaging-hosts"));
|
|
#else
|
|
cur = base::FilePath(FILE_PATH_LITERAL(
|
|
"/etc/chromium/native-messaging-hosts"));
|
|
@@ -576,7 +581,7 @@
|
|
return false;
|
|
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
|
|
break;
|
|
-#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
|
|
#if !defined(OS_ANDROID)
|
|
case chrome::DIR_GLOBAL_GCM_STORE:
|
|
if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
|