aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2010-04-26 13:31:09 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2010-04-26 13:31:09 +0000
commitb44d8f6f730237f773502439738747a5c1180063 (patch)
tree746314659b79bdaa60dfb8149a3da47353580c9f
parent976a991ce171e7b5fcf76101b18c6bc6e4e19ff9 (diff)
downloadmsec-b44d8f6f730237f773502439738747a5c1180063.tar
msec-b44d8f6f730237f773502439738747a5c1180063.tar.gz
msec-b44d8f6f730237f773502439738747a5c1180063.tar.bz2
msec-b44d8f6f730237f773502439738747a5c1180063.tar.xz
msec-b44d8f6f730237f773502439738747a5c1180063.zip
Support loading and merging legacy perm.conf.
-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 f07b745..4e1c42b 100755
--- a/src/msec/msecperms.py
+++ b/src/msec/msecperms.py
@@ -169,6 +169,11 @@ if __name__ == "__main__":
newlevel.save()
sys.exit(0)
+ # 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)
+
# load the main permission class
perm = PERMS(log, root=root)