From 3110dec4f323e5cd6aaa9d3f740df3116d2a6656 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Wed, 24 Aug 2005 20:00:10 +0000
Subject: [PATCH] fix tunables

---
 refpolicy/policy/support/loadable_module.spt | 42 ++++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/refpolicy/policy/support/loadable_module.spt b/refpolicy/policy/support/loadable_module.spt
index 8078a928..a520becb 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
+		}
+	')
 ')