From b44d8f6f730237f773502439738747a5c1180063 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Mon, 26 Apr 2010 13:31:09 +0000
Subject: Support loading and merging legacy perm.conf.

---
 src/msec/msecperms.py | 5 +++++
 1 file changed, 5 insertions(+)

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)
 
-- 
cgit v1.2.1