1 files changed, 10 insertions, 13 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
index 0a30a070a..ae93fae4a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
@@ -1,11 +1,11 @@
 """ CfgEncryptedGenerator lets you encrypt your plaintext
 :ref:`server-plugins-generators-cfg` files on the server. """
 
+import Bcfg2.Options
 from Bcfg2.Server.Plugin import PluginExecutionError
-from Bcfg2.Server.Plugins.Cfg import CfgGenerator, SETUP
+from Bcfg2.Server.Plugins.Cfg import CfgGenerator
 try:
-    from Bcfg2.Encryption import bruteforce_decrypt, EVPError, \
-        get_algorithm, CFG_SECTION
+    from Bcfg2.Server.Encryption import bruteforce_decrypt, EVPError
     HAS_CRYPTO = True
 except ImportError:
     HAS_CRYPTO = False
@@ -22,8 +22,8 @@ class CfgEncryptedGenerator(CfgGenerator):
     #: .genshi.crypt and .cheetah.crypt files
     __priority__ = 50
 
-    def __init__(self, fname, spec, encoding):
-        CfgGenerator.__init__(self, fname, spec, encoding)
+    def __init__(self, fname, spec):
+        CfgGenerator.__init__(self, fname, spec)
         if not HAS_CRYPTO:
             raise PluginExecutionError("M2Crypto is not available")
 
@@ -33,17 +33,14 @@ class CfgEncryptedGenerator(CfgGenerator):
             return
         # todo: let the user specify a passphrase by name
         try:
-            self.data = bruteforce_decrypt(
-                self.data, setup=SETUP,
-                algorithm=get_algorithm(SETUP))
+            self.data = bruteforce_decrypt(self.data)
         except EVPError:
-            strict = SETUP.cfp.get(CFG_SECTION, "decrypt",
-                                   default="strict")
             msg = "Cfg: Failed to decrypt %s" % self.name
-            if strict:
-                raise PluginExecutionError(msg)
-            else:
+            print "lax decrypt: %s" % Bcfg2.Options.setup.lax_decryption
+            if Bcfg2.Options.setup.lax_decryption:
                 self.logger.debug(msg)
+            else:
+                raise PluginExecutionError(msg)
 
     def get_data(self, entry, metadata):
         if self.data is None: