46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/policygen.py
|
|
--- nsasepolgen/src/sepolgen/policygen.py 2008-08-28 09:34:24.000000000 -0400
|
|
+++ policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/policygen.py 2008-09-11 09:26:52.000000000 -0400
|
|
@@ -134,6 +134,10 @@
|
|
m.refpolicy = False
|
|
|
|
def get_module(self):
|
|
+ # Generate the requires
|
|
+ if self.gen_requires:
|
|
+ gen_requires(self.module)
|
|
+
|
|
"""Return the generated module"""
|
|
return self.module
|
|
|
|
@@ -163,18 +167,10 @@
|
|
# Generate the raw allow rules from the filtered list
|
|
self.__add_allow_rules(raw_allow)
|
|
|
|
- # Generate the requires
|
|
- if self.gen_requires:
|
|
- gen_requires(self.module)
|
|
-
|
|
def add_role_types(self, role_type_set):
|
|
for role_type in role_type_set:
|
|
self.module.children.append(role_type)
|
|
|
|
- # Generate the requires
|
|
- if self.gen_requires:
|
|
- gen_requires(self.module)
|
|
-
|
|
def explain_access(av, ml=None, verbosity=SHORT_EXPLANATION):
|
|
"""Explain why a policy statement was generated.
|
|
|
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/refparser.py
|
|
--- nsasepolgen/src/sepolgen/refparser.py 2008-08-28 09:34:24.000000000 -0400
|
|
+++ policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/refparser.py 2008-08-29 14:34:59.000000000 -0400
|
|
@@ -919,7 +919,7 @@
|
|
def list_headers(root):
|
|
modules = []
|
|
support_macros = None
|
|
- blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
|
|
+ blacklist = ["uml.if", "thunderbird.if"]
|
|
|
|
for dirpath, dirnames, filenames in os.walk(root):
|
|
for name in filenames:
|