From b928020970569017cf8e74c75a449dfffaf03cfd Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Fri, 14 Oct 2011 10:22:16 -0400
Subject: [PATCH] Remove deprecated optional_policy usage.

This was deprecated July 25, 2006.
---
 policy/support/loadable_module.spt | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/policy/support/loadable_module.spt b/policy/support/loadable_module.spt
index 1fe3ab343..03906bc44 100644
--- a/policy/support/loadable_module.spt
+++ b/policy/support/loadable_module.spt
@@ -94,16 +94,11 @@ define(`policy_call_depth',0)
 # Optional policy handling
 #
 define(`optional_policy',`
-	ifelse(regexp(`$1',`\W'),`-1',`
-		refpolicywarn(`deprecated use of module name ($1) as first parameter of optional_policy() block.')
-		optional_policy(shift($*))
-	',`
-		optional {`'pushdef(`__in_optional_policy')
-			$1
-		ifelse(`$2',`',`',`} else {
-			$2
-		')}`'popdef(`__in_optional_policy')`'ifndef(`__in_optional_policy',` # end optional')
-	')
+	optional {`'pushdef(`__in_optional_policy')
+		$1
+	ifelse(`$2',`',`',`} else {
+		$2
+	')}`'popdef(`__in_optional_policy')`'ifndef(`__in_optional_policy',` # end optional')
 ')
 
 ##############################