From 86509bce6c14f4b7c791e0de2494c3df2f0aba2d Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Tue, 16 Dec 2014 14:47:42 -0500
Subject: [PATCH] Remove the removal of the ccache

It is not necessary to remove the ccache on upgrades on modern IPA
servers, even if the ccache contains stale data either it is re-initialized by
mod_auth_kerb or a new ccache collection is created (if completely unrelated
credentials were present), at least when using DIR or keyring ccaches.

This line causes wrong SELinux labels to be set in the kernel keyring on
uprades, which the cause the apache server to fail to use th ccache.

https://fedorahosted.org/freeipa/ticket/4815

Reviewed-By: Martin Kosek <mkosek@redhat.com>
---
 install/tools/ipa-upgradeconfig | 1 -
 1 file changed, 1 deletion(-)
 mode change 100644 => 100755 install/tools/ipa-upgradeconfig

diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
old mode 100644
new mode 100755
index 6b687fbd73d01f6574cd8ea3193cedba4d5c0e67..005f3a72df115e63c81a7ca8825fb12cac0a5f81
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -1382,7 +1382,6 @@ def main():
         fstore.restore_file(removed_sysconfig_file)
 
     http = httpinstance.HTTPInstance(fstore)
-    http.remove_httpd_ccache()
     http.configure_selinux_for_httpd()
     http.change_mod_nss_port_from_http()
 
-- 
2.1.0