Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Unified Diff: main.cc

Issue 3541011: entd: Add policy signatures (Closed) Base URL: http://git.chromium.org/git/entd.git
Patch Set: Address review comments Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bin/fix_pkcs11_token.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: main.cc
diff --git a/main.cc b/main.cc
index a8d96f3ce742a11921fa830b399d79d22b13c2a7..144495c4bd4a7ce923df00835ee5d6c1b9b3ade7 100644
--- a/main.cc
+++ b/main.cc
@@ -157,9 +157,15 @@ int main(int argc, char** argv) {
if (file_util::PathExists(path))
manifest = path.value();
- path = FilePath(extension_path).Append("root_ca.pem");
- if (file_util::PathExists(path))
+ path = FilePath(extension_path).Append("root-ca.pem");
+ if (file_util::PathExists(path)) {
root_ca_file = path.value();
+ } else {
+ // Backwards compatibility for old filename with underscore.
+ path = FilePath(extension_path).Append("root_ca.pem");
+ if (file_util::PathExists(path))
+ root_ca_file = path.value();
+ }
}
// Command line switches for policy files override extension filepaths
« no previous file with comments | « bin/fix_pkcs11_token.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698