diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index e64a6627f..dd3f46b07 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -215,7 +215,7 @@ class CryptoTool(object): """ get the passphrase for the current file """ if not Bcfg2.Options.setup.passphrases: raise PassphraseError("No passphrases available in %s" % - Bcfg2.Options.setup.configfile) + Bcfg2.Options.setup.config) pname = None if Bcfg2.Options.setup.passphrase: @@ -229,7 +229,7 @@ class CryptoTool(object): return (pname, passphrase) except KeyError: raise PassphraseError("Could not find passphrase %s in %s" % - (pname, Bcfg2.Options.setup.configfile)) + (pname, Bcfg2.Options.setup.config)) else: if len(Bcfg2.Options.setup.passphrases) == 1: pname, passphrase = Bcfg2.Options.setup.passphrases.items()[0] @@ -285,7 +285,7 @@ class CfgEncryptor(Encryptor): if self.passphrase is None: raise PassphraseError("Multiple passphrases found in %s, " "specify one on the command line with -p" % - Bcfg2.Options.setup.configfile) + Bcfg2.Options.setup.config) def encrypt(self): return ssl_encrypt(self.data, self.passphrase) @@ -367,19 +367,19 @@ class PropertiesCryptoMixin(object): """ Get the passphrase to use to encrypt or decrypt a given element """ pname = element.get("encrypted") - if pname in self.passphrases: - passphrase = self.passphrases[pname] + if pname in Bcfg2.Options.setup.passphrases: + passphrase = Bcfg2.Options.setup.passphrases[pname] elif self.passphrase: if pname: self.logger.warning("Passphrase %s not found in %s, " "using passphrase given on command line" % - (pname, Bcfg2.Options.setup.configfile)) + (pname, Bcfg2.Options.setup.config)) passphrase = self.passphrase pname = self.pname else: raise PassphraseError("Multiple passphrases found in %s, " "specify one on the command line with -p" % - Bcfg2.Options.setup.configfile) + Bcfg2.Options.setup.config) return (pname, passphrase) def _write(self, filename, data): @@ -579,7 +579,7 @@ class CLI(object): if data is None: data = getattr(tool, mode)() - if not data: + if data is None: self.logger.error("Failed to %s %s, skipping" % (mode, fname)) continue if Bcfg2.Options.setup.stdout: |