enable optionals in base/monolithic
This commit is contained in:
parent
7fd9a6007d
commit
0db866cbf4
|
@ -1,3 +1,5 @@
|
||||||
|
- Enable optional blocks in base module and monolithic policy.
|
||||||
|
This requires checkpolicy 1.30.1.
|
||||||
- Fix vpn module declaration.
|
- Fix vpn module declaration.
|
||||||
- Numerous fixes from Dan Walsh.
|
- Numerous fixes from Dan Walsh.
|
||||||
- Change build order to preserve m4 line number information so policy
|
- Change build order to preserve m4 line number information so policy
|
||||||
|
|
|
@ -24,10 +24,16 @@ define(`policy_module',`
|
||||||
# For use in interfaces, to optionally insert a require block
|
# For use in interfaces, to optionally insert a require block
|
||||||
#
|
#
|
||||||
define(`gen_require',`
|
define(`gen_require',`
|
||||||
ifdef(`self_contained_policy',`',`
|
ifdef(`self_contained_policy',`
|
||||||
|
ifdef(`__in_optional_policy',`
|
||||||
|
require {
|
||||||
|
$1
|
||||||
|
} # end require
|
||||||
|
')
|
||||||
|
',`
|
||||||
require {
|
require {
|
||||||
$1
|
$1
|
||||||
}
|
} # end require
|
||||||
')
|
')
|
||||||
')
|
')
|
||||||
|
|
||||||
|
@ -86,17 +92,15 @@ define(`policy_call_depth',0)
|
||||||
# Optional policy handling
|
# Optional policy handling
|
||||||
#
|
#
|
||||||
define(`optional_policy',`
|
define(`optional_policy',`
|
||||||
ifdef(`self_contained_policy',`
|
optional {
|
||||||
ifdef(`$1.te',`$2',`$3')
|
pushdef(`__in_optional_policy') dnl
|
||||||
',`
|
$2
|
||||||
optional {
|
popdef(`__in_optional_policy') dnl
|
||||||
$2
|
ifelse(`$3',`',`',`
|
||||||
ifelse(`$3',`',`',`
|
} else {
|
||||||
} else {
|
$3
|
||||||
$3
|
|
||||||
')
|
|
||||||
}
|
|
||||||
')
|
')
|
||||||
|
}
|
||||||
')
|
')
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
|
|
Loading…
Reference in New Issue