Module: check_mk
Branch: master
Commit: 743ae96c3af0564393875043e695d7c73848b249
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=743ae96c3af056…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jun 21 18:54:11 2017 +0200
Fixed factory reset of trusted certificate authorities
Change-Id: I1dd3f8e028354a4f4dde48ca21038e01df4cca41
---
web/htdocs/watolib.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index f96f4d0..40e1c8d 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -433,9 +433,14 @@ class ConfigDomainCACertificates(ConfigDomain):
def save(self, settings, site_specific=False):
super(ConfigDomainCACertificates, self).save(settings,
site_specific=site_specific)
+ current_config = settings.get("trusted_certificate_authorities", {
+ "use_system_wide_cas": True,
+ "trusted_cas": [],
+ })
+
# We need to activate this immediately to make syncs to WATO slave sites
# possible right after changing the option
- configuration_warnings =
self._update_trusted_cas(settings["trusted_certificate_authorities"])
+ configuration_warnings = self._update_trusted_cas(current_config)
if configuration_warnings:
raise MKUserError(None, ", ".join(configuration_warnings))