summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2016-11-21 15:44:43 +0100
committerGitHub <noreply@github.com>2016-11-21 15:44:43 +0100
commit838067138828a8ebf1d4cb37b47d87c07d4c8aae (patch)
tree4fe004a0f8af21efa30c2642609e837616a71013 /src
parent70b5fa188d74d252e590b42b8303e5bcf3c387a5 (diff)
parent0b8997e24f465bfa3e0f0b0578632c02d6c29c13 (diff)
downloadbcfg2-838067138828a8ebf1d4cb37b47d87c07d4c8aae.tar.gz
bcfg2-838067138828a8ebf1d4cb37b47d87c07d4c8aae.tar.bz2
bcfg2-838067138828a8ebf1d4cb37b47d87c07d4c8aae.zip
Merge pull request #368 from solj/fix-ssl-futurewarning
Cfg: Fix SSLCA key generation
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py4
1 files changed, 2 insertions, 2 deletions
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':