entd: Add policy signatures

main.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <syslog.h>
 
 // syslog.h and base/logging.h both try to #define LOG_INFO and LOG_WARNING.
 // We need to #undef at least these two before including base/logging.h.  The
 // others are included to be consistent.
@@ skipping 139 matching lines @@
 
   if (valid_policy) {
     FilePath path = FilePath(extension_path).Append("policy.js");
     if (file_util::PathExists(path))
       policy = path.value();
 
     path = FilePath(extension_path).Append("manifest.json");
     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
   if (cl->HasSwitch(switches::kPolicy))
     policy = cl->GetSwitchValueASCII(switches::kPolicy);
   if (cl->HasSwitch(switches::kManifest))
     manifest = cl->GetSwitchValueASCII(switches::kManifest);
   if (cl->HasSwitch(switches::kUtility))
     utility = cl->GetSwitchValueASCII(switches::kUtility);
 
@@ skipping 40 matching lines @@
   if (!manifest.empty())
     d.SetManifestFile(manifest);
 
   if (!policy.empty())
     d.SetPolicyFile(policy);
 
   uint32_t rv = d.Run();
   LOG(INFO) << "Exiting entd with code: " << rv;
   return rv;
 }