Change pppd_can_insmod to a Boolean so tunables and Booleans are not mixed.

This commit is contained in:
Chris PeBenito 2011-08-25 07:34:08 -04:00
parent 66e03ec8b2
commit 68bbbbdec6
1 changed files with 9 additions and 4 deletions

View File

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