From a4682ceae6774956461edd03b2485bbacea445f4 Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Tue, 4 Oct 2011 01:17:41 +0000
Subject: Bugzilla Bug #688225 - (dogtagIPAv2.1) TRACKER: of  the Dogtag fixes
 for freeIPA 2.1

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/tags/IPA_v2_RHEL_6_2_20111003@2252 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 pki/patches/pki-core-9.0.3-r2149.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pki/patches/pki-core-9.0.3-r2149.patch

(limited to 'pki/patches/pki-core-9.0.3-r2149.patch')

diff --git a/pki/patches/pki-core-9.0.3-r2149.patch b/pki/patches/pki-core-9.0.3-r2149.patch
new file mode 100644
index 000000000..f897411b5
--- /dev/null
+++ b/pki/patches/pki-core-9.0.3-r2149.patch
@@ -0,0 +1,26 @@
+diff -ru base/common/scripts/functions /vakwetu/6.1/pki/base/common/scripts/functions
+--- base/common/scripts/functions       2011-08-15 15:51:43.745919766 -0700
++++ /vakwetu/6.1/pki/base/common/scripts/functions      2011-08-15 14:07:29.058928170 -0700
+@@ -693,12 +693,18 @@
+     # Invoke the initscript for this instance
+     case $PKI_SUBSYSTEM_TYPE in
+         ca|kra|ocsp|tks)
+-            /usr/bin/runcon -t pki_${PKI_SUBSYSTEM_TYPE}_script_t $PKI_INSTANCE_INITSCRIPT start
+-            rv=$?
++            if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
++                /usr/bin/runcon -t pki_${PKI_SUBSYSTEM_TYPE}_script_t \
++                     $PKI_INSTANCE_INITSCRIPT start
++                rv=$?
++            else
++                $PKI_INSTANCE_INITSCRIPT start
++                rv=$?
++            fi
+             ;;
+         ra|tps)
+-    $PKI_INSTANCE_INITSCRIPT start
+-    rv=$?
++            $PKI_INSTANCE_INITSCRIPT start
++            rv=$?
+             ;;
+     esac
+
-- 
cgit