diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-11-18 14:16:33 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-11-18 14:16:33 -0600 |
| commit | 0b8997e24f465bfa3e0f0b0578632c02d6c29c13 (patch) | |
| tree | 035547a27ab0ae5b0bf2a936959bde80a0c04576 /src | |
| parent | a472e687840a12a20bb2c22875de6efad8ddc257 (diff) | |
| download | bcfg2-0b8997e24f465bfa3e0f0b0578632c02d6c29c13.tar.gz bcfg2-0b8997e24f465bfa3e0f0b0578632c02d6c29c13.tar.bz2 bcfg2-0b8997e24f465bfa3e0f0b0578632c02d6c29c13.zip | |
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 <sol.jerome@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py | 4 |
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': |