diff --git a/refpolicy/policy/support/loadable_module.spt b/refpolicy/policy/support/loadable_module.spt index 8078a92..a520bec 100644 --- a/refpolicy/policy/support/loadable_module.spt +++ b/refpolicy/policy/support/loadable_module.spt @@ -106,39 +106,39 @@ define(`dflt_or_overr',`ifdef(`$1',$1,$2)') # # Tunable declaration # -# cjp: modular policy commented out -# until loadable modules support tunables. define(`gen_tunable',` -# ifdef(`monolithic_policy',` + ifdef(`monolithic_policy',` bool $1 dflt_or_overr(`$1'_conf,$2); -# ',` -# # loadable module tunable -# # declaration will go here -# # for $1 $2 -# ') + ',` + # loadable module tunable + # declaration will go here + # instead of bool when + # loadable modules support + # tunables + bool $1 dflt_or_overr($1'_conf,$2); + ') ') ############################## # # Tunable policy handling # -# cjp: modular policy commented out -# until loadable modules support tunables. define(`tunable_policy',` -# ifdef(`monolithic_policy',` + ifdef(`monolithic_policy',` if (`$1') { $2 } else { $3 } -# ',` -# optional { -# require { `$1' } -# $2 -# ifelse(`$3',`',`',` -# } else { -# $3 -# ') -# } -# ') + ',` + # structure for tunables + # will go here instead of a + # conditional when loadable + # modules support tunables + if ($1') { + $2 + } else { + $3 + } + ') ')