aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-02-25 19:27:47 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-02-25 19:27:47 +0000
commit6d650cb43b8532bb9f6060511603e999b0c3ff1c (patch)
tree240df5743b803abd429428994b4f9c8604d44293
parent7f144159110c5922252bee03808d503825d7099e (diff)
downloadmsec-6d650cb43b8532bb9f6060511603e999b0c3ff1c.tar
msec-6d650cb43b8532bb9f6060511603e999b0c3ff1c.tar.gz
msec-6d650cb43b8532bb9f6060511603e999b0c3ff1c.tar.bz2
msec-6d650cb43b8532bb9f6060511603e999b0c3ff1c.tar.xz
msec-6d650cb43b8532bb9f6060511603e999b0c3ff1c.zip
Better support for plugin names.
-rwxr-xr-xsrc/msec/libmsec.py2
-rw-r--r--src/msec/plugins/apparmor.py2
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)