[COMMIT]refpolicy-contrib branch, master, updated. f0f7b65d39c33c76773ef405ab0e7fe4b35d8371

[cpebenito at oss.tresys.com]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "refpolicy-contrib".

The branch, master has been updated
       via  f0f7b65d39c33c76773ef405ab0e7fe4b35d8371 (commit)
      from  9401ae10439194149e43f840803281590111978f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0f7b65d39c33c76773ef405ab0e7fe4b35d8371
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Tue Sep 13 14:40:04 2011 -0400

    Update ppp for secure_mode_insmod implementation change.
    
    Change pppd_can_insmod to tunable.

-----------------------------------------------------------------------

Summary of changes:
 ppp.te |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

Detailed diffset:
:100644 100644 a2d43a9... 65abdc7... M	ppp.te

diff --git a/ppp.te b/ppp.te
index a2d43a9..65abdc7 100644
--- a/ppp.te
+++ b/ppp.te
@@ -1,4 +1,4 @@
-policy_module(ppp, 1.12.1)
+policy_module(ppp, 1.12.2)
 
 ########################################
 #
@@ -10,7 +10,7 @@ policy_module(ppp, 1.12.1)
 ## Allow pppd to load kernel modules for certain modems
 ## </p>
 ## </desc>
-gen_bool(pppd_can_insmod, false)
+gen_tunable(pppd_can_insmod, false)
 
 ## <desc>
 ## <p>
@@ -187,14 +187,9 @@ optional_policy(`
 ')
 
 optional_policy(`
-	# The toolchain does not support nested conditionals
-	gen_require(`
-		bool secure_mode_insmod;
+	tunable_policy(`pppd_can_insmod',`
+		modutils_domtrans_insmod(pppd_t)
 	')
-
-	if (pppd_can_insmod && ! secure_mode_insmod) {
-		modutils_domtrans_insmod_uncond(pppd_t)
-	}
 ')
 
 optional_policy(`


hooks/post-receive
--
refpolicy-contrib