From mboxrd@z Thu Jan  1 00:00:00 1970
From: sven.vermeulen@siphos.be (Sven Vermeulen)
Date: Mon, 13 Aug 2012 21:02:31 +0200
Subject: [refpolicy] [PATCH v2 3/6] Fix typo in interface
	postfix_exec_postqueue
In-Reply-To: <1344884554-25135-1-git-send-email-sven.vermeulen@siphos.be>
References: <1344884554-25135-1-git-send-email-sven.vermeulen@siphos.be>
Message-ID: <1344884554-25135-4-git-send-email-sven.vermeulen@siphos.be>
To: refpolicy@oss.tresys.com
List-Id: refpolicy.oss.tresys.com

To allow domains to execute the postqueue command, they should use
postfix_exec_postqueue, not posftix_exec_postqueue.

Signed-off-by: Sven Vermeulen <sven.vermeulen@siphos.be>
---
 nagios.te  |    2 +-
 postfix.if |   18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/nagios.te b/nagios.te
index c3e2a2d..b8127bc 100644
--- a/nagios.te
+++ b/nagios.te
@@ -300,7 +300,7 @@ optional_policy(`
 
 optional_policy(`
 	postfix_stream_connect_master(nagios_mail_plugin_t)
-	posftix_exec_postqueue(nagios_mail_plugin_t)
+	postfix_exec_postqueue(nagios_mail_plugin_t)
 ')
 
 ######################################
diff --git a/postfix.if b/postfix.if
index 00e30cb..d92b038 100644
--- a/postfix.if
+++ b/postfix.if
@@ -454,7 +454,8 @@ interface(`postfix_domtrans_postqueue',`
 
 #######################################
 ## <summary>
-##	Execute the master postqueue in the caller domain.
+##	Execute the master postqueue in the caller domain. (Deprecated)
+##	Please use postfix_exec_postqueue instead
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -463,6 +464,21 @@ interface(`postfix_domtrans_postqueue',`
 ## </param>
 #
 interface(`posftix_exec_postqueue',`
+	refpolicywarn(`$0($*) has been deprecated.')
+	postfix_exec_postqueue($1)
+')
+
+#######################################
+## <summary>
+##	Execute the master postqueue in the caller domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`postfix_exec_postqueue',`
 	gen_require(`
 		type postfix_postqueue_exec_t;
 	')
-- 
1.7.8.6