From 5a33bb636eaae5bbd9b4369266d342ea4508dffc Mon Sep 17 00:00:00 2001
From: vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Tue, 9 Aug 2011 17:26:13 +0000
Subject: Resolves #700505 - pki tomcat6 instances currently running unconfined

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2127 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 pki/base/common/scripts/functions | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'pki/base/common/scripts')

diff --git a/pki/base/common/scripts/functions b/pki/base/common/scripts/functions
index 2334e7820..2ae93c520 100644
--- a/pki/base/common/scripts/functions
+++ b/pki/base/common/scripts/functions
@@ -691,8 +691,16 @@ start_instance()
     fi
 
     # Invoke the initscript for this instance
-    $PKI_INSTANCE_INITSCRIPT start
-    rv=$?
+    case $PKI_SUBSYSTEM_TYPE in
+        ca|kra|ocsp|tks)
+            /usr/bin/runcon -t pki_${PKI_SUBSYSTEM_TYPE}_script_t $PKI_INSTANCE_INITSCRIPT start
+            rv=$?
+            ;;
+        ra|tps)
+            $PKI_INSTANCE_INITSCRIPT start
+            rv=$?
+            ;;
+    esac
 
     if [ $rv -ne 0 ] ; then
         return $rv
-- 
cgit