Unconfined_t needs to transition to useradd_t and useradd_t needs to be able to manag...

[people/stevee/selinux-policy.git] / Rules.modular

diff --git a/Rules.modular b/Rules.modular
index 1b767b07c8ed962a87441b92c02b4ef80a3aff28..c2bf4910871d0a7649f8f04b23ebf2ecedc20e64 100644 (file)
--- a/Rules.modular
+++ b/Rules.modular
@@ -15,7 +15,7 @@ users_extra := $(tmpdir)/users_extra
 
 base_sections := $(tmpdir)/pre_te_files.conf $(tmpdir)/all_attrs_types.conf $(tmpdir)/global_bools.conf $(tmpdir)/only_te_rules.conf $(tmpdir)/all_post.conf
 
-base_pre_te_files := $(secclass) $(isids) $(avs) $(m4support) $(poldir)/mls $(poldir)/mcs
+base_pre_te_files := $(secclass) $(isids) $(avs) $(m4support) $(poldir)/mls $(poldir)/mcs $(policycaps)
 base_te_files := $(base_mods)
 base_post_te_files := $(user_files) $(poldir)/constraints
 base_fc_files := $(base_mods:.te=.fc)
@@ -125,7 +125,7 @@ $(tmpdir)/pre_te_files.conf: $(base_pre_te_files)
        @test -d $(tmpdir) || mkdir -p $(tmpdir)
        $(verbose) $(M4) $(M4PARAM) $^ > $@
 
-$(tmpdir)/generated_definitions.conf: $(base_te_files)
+$(tmpdir)/generated_definitions.conf:
        @test -d $(tmpdir) || mkdir -p $(tmpdir)
 # define all available object classes
        $(verbose) $(genperm) $(avs) $(secclass) > $@
@@ -157,7 +157,7 @@ endif
        $(verbose) $(M4) $(M4PARAM) -s $^ > $@
 
 $(tmpdir)/post_te_files.conf: M4PARAM += -D self_contained_policy
-$(tmpdir)/post_te_files.conf: $(m4support) $(base_post_te_files)
+$(tmpdir)/post_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(base_post_te_files)
        @test -d $(tmpdir) || mkdir -p $(tmpdir)
        $(verbose) $(M4) $(M4PARAM) $^ > $@
 
@@ -190,16 +190,6 @@ endif
        @test -d $(tmpdir) || mkdir -p $(tmpdir)
        $(verbose) $(M4) $(M4PARAM) $^ > $@
 
-########################################
-#
-# Remove the dontaudit rules from the base.conf
-#
-enableaudit: $(base_conf)
-       @test -d $(tmpdir) || mkdir -p $(tmpdir)
-       @echo "Removing dontaudit rules from $(^F)"
-       $(verbose) $(GREP) -v dontaudit $(base_conf) > $(tmpdir)/base.audit
-       $(verbose) mv $(tmpdir)/base.audit $(base_conf)
-
 ########################################
 #
 # Appconfig files
@@ -217,6 +207,7 @@ validate: $(base_pkg) $(mod_pkgs)
        @echo "Validating policy linking."
        $(verbose) $(SEMOD_LNK) -o $(tmpdir)/test.lnk $^
        $(verbose) $(SEMOD_EXP) $(tmpdir)/test.lnk $(tmpdir)/policy.bin
+       $(verbose) $(SEPOLGEN) -p $(tmpdir)/policy.bin -i $(poldir) -o $(tmpdir)/output
        @echo "Success."
 
 ########################################