[selinux-policy: 589/3172] do bools until loadable modules support tunables

[Daniel J Walsh]

commit 82024f9942716a693a9925b4c24ea5d823e84b92
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Wed Aug 24 18:30:47 2005 +0000

    do bools until loadable modules support tunables

 refpolicy/policy/support/loadable_module.spt |   38 ++++++++++++++-----------
 1 files changed, 21 insertions(+), 17 deletions(-)
---
diff --git a/refpolicy/policy/support/loadable_module.spt b/refpolicy/policy/support/loadable_module.spt
index a7c9673..8078a92 100644
--- a/refpolicy/policy/support/loadable_module.spt
+++ b/refpolicy/policy/support/loadable_module.spt
@@ -106,35 +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
+#		# for $1 $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
-		')
-		}
-	')
+#	',`
+#		optional {
+#			require { `$1' }
+#			$2
+#		ifelse(`$3',`',`',`
+#		} else {
+#			$3
+#		')
+#		}
+#	')
 ')