From 0b8997e24f465bfa3e0f0b0578632c02d6c29c13 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 18 Nov 2016 14:16:33 -0600 Subject: Cfg: Fix SSLCA key generation The previous check resulted in a "FutureWarning" and also did not work as expected and reset the key values in every case. Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py index a158302be..241bce34c 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py @@ -19,8 +19,8 @@ class CfgSSLCAKeyCreator(XMLCfgCreator): self.logger.info("Cfg: Generating new SSL key for %s" % self.name) spec = self.XMLMatch(metadata) key = spec.find("Key") - if not key: - key = dict() + if key is None: + key = {} ktype = key.get('type', 'rsa') bits = key.get('bits', '2048') if ktype == 'rsa': -- cgit v1.2.3-1-g7c22