aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2010-04-26 13:32:36 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2010-04-26 13:32:36 +0000
commit4cacf031a2aa0ef0b31b92085624bebb8084d73d (patch)
tree4ae6648f414044ba4dc932a043fb234adc96bc58
parent3151bb0ee534e912965a50e948fb9347210a1669 (diff)
downloadmsec-4cacf031a2aa0ef0b31b92085624bebb8084d73d.tar
msec-4cacf031a2aa0ef0b31b92085624bebb8084d73d.tar.gz
msec-4cacf031a2aa0ef0b31b92085624bebb8084d73d.tar.bz2
msec-4cacf031a2aa0ef0b31b92085624bebb8084d73d.tar.xz
msec-4cacf031a2aa0ef0b31b92085624bebb8084d73d.zip
Support loading and merging legacy perm.conf file.
-rwxr-xr-xsrc/msec/msecperms.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/msec/msecperms.py b/src/msec/msecperms.py
index ec50dca..21f7e31 100755
--- a/src/msec/msecperms.py
+++ b/src/msec/msecperms.py
@@ -144,6 +144,11 @@ if __name__ == "__main__":
# load variables from base level
config.merge_with_baselevel(log, permconf, base_level, config.load_default_perms, root='')
+ # merge with a legacy perm.local
+ permlocal = config.PermConfig(log, config="%s/etc/security/msec/perm.local" % root)
+ permlocal.load()
+ permconf.merge(permlocal, overwrite=True)
+
# reloading levelconf for base level
levelconf = config.load_default_perms(log, base_level, root=root)