From 6d650cb43b8532bb9f6060511603e999b0c3ff1c Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov Date: Wed, 25 Feb 2009 19:27:47 +0000 Subject: Better support for plugin names. --- src/msec/libmsec.py | 2 +- src/msec/plugins/apparmor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msec/libmsec.py b/src/msec/libmsec.py index f8d0a12..1b2b834 100755 --- a/src/msec/libmsec.py +++ b/src/msec/libmsec.py @@ -762,7 +762,7 @@ class MSEC: plugin_name = getattr(plugin, "PLUGIN") plugin_class = getattr(plugin, plugin_name) plugin = plugin_class(log=self.log, configfiles=self.configfiles, root=self.root) - self.plugins[plugin_f] = plugin + self.plugins[plugin_name] = plugin self.log.debug("Loaded plugin '%s'" % plugin_f) except: self.log.error(_("Error loading plugin '%s' from %s: %s") % (plugin_f, file, sys.exc_value)) diff --git a/src/msec/plugins/apparmor.py b/src/msec/plugins/apparmor.py index 40fd969..6bebeba 100644 --- a/src/msec/plugins/apparmor.py +++ b/src/msec/plugins/apparmor.py @@ -18,7 +18,7 @@ class apparmor: # configuring entry in global settings param = 'ENABLE_APPARMOR' - callback = "apparmor.enable_apparmor" + callback = "%s.enable_apparmor" % PLUGIN valid_values = ['yes', 'no'] config.SETTINGS[param] = (callback, valid_values) -- cgit v1.2.1