Bug 1496180 - Add security devices description and correct error parsing. r=flod,Felipe
authorMichael Kaply <mozilla@kaply.com>
Thu, 04 Oct 2018 17:04:42 +0000
changeset 495381 5dc2619c0a5bac07a3e7409004589e2fceade1b9
parent 495380 3acd60dbb363995157c4825cd2896158028008e6
child 495382 d9f4923892754c462907bdc524efcf37d75306a7
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod, Felipe
bugs1496180
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1496180 - Add security devices description and correct error parsing. r=flod,Felipe Differential Revision: https://phabricator.services.mozilla.com/D7747
browser/components/enterprisepolicies/Policies.jsm
browser/locales/en-US/browser/policies/policies-descriptions.ftl
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -760,17 +760,17 @@ var Policies = {
       runOncePerModification("securityDevices",
                              JSON.stringify(securityDevices),
                              () => {
         let pkcs11 = Cc["@mozilla.org/security/pkcs11moduledb;1"].getService(Ci.nsIPKCS11ModuleDB);
         for (let deviceName in securityDevices) {
           try {
             pkcs11.addModule(deviceName, securityDevices[deviceName], 0, 0);
           } catch (ex) {
-            log.error("Unable to add security device ${deviceName}");
+            log.error(`Unable to add security device ${deviceName}`);
             log.debug(ex);
           }
         }
       });
     },
   },
 
   "WebsiteFilter": {
--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -105,11 +105,14 @@ policy-PopupBlocking = Allow certain web
 policy-Proxy = Configure proxy settings.
 
 policy-SanitizeOnShutdown = Clear all navigation data on shutdown.
 
 policy-SearchBar = Set the default location of the search bar. The user is still allowed to customize it.
 
 policy-SearchEngines = Configure search engine settings. This policy is only available on the Extended Support Release (ESR) version.
 
+# For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/PKCS11/Module_Installation
+policy-SecurityDevices = Install PKCS #11 modules.
+
 # “format” refers to the format used for the value of this policy. See also:
 # https://github.com/mozilla/policy-templates/blob/master/README.md#websitefilter-machine-only
 policy-WebsiteFilter = Block websites from being visited. See documentation for more details on the format.