On 11/10/2014 04:36 PM, Martin Kosek wrote:
On 11/10/2014 02:52 PM, Petr Viktorin wrote:
This is a fix for: https://fedorahosted.org/freeipa/ticket/4668
And the patch is...?
Here, sorry.
--
Petr³
From 45c939b7fcd8b07ad9b70bdb8eef4b6d5814867d Mon Sep 17 00:00:00 2001
From: Petr Viktorin pvikt...@redhat.com
Date: Mon, 10 Nov 2014 13:29:58 +0100
Subject: [PATCH] ipa-restore: Don't crash if AD trust is not installed
https://fedorahosted.org/freeipa/ticket/4668
---
ipaserver/install/ipa_restore.py | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 7898de0f6f6613db95ea93bb4a91bd44a2c68951..cfe3dff9fff539a7df038b20063ca3da36c8a64f 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -37,13 +37,17 @@
get_cs_replication_manager)
from ipaserver.install import installutils
from ipaserver.install import httpinstance
-from ipaserver.install import adtrustinstance
from ipapython import ipaldap
import ipapython.errors
from ipaplatform.tasks import tasks
from ipaplatform import services
from ipaplatform.paths import paths
+try:
+from ipaserver.install import adtrustinstance
+except ImportError:
+adtrustinstance = None
+
def recursive_chown(path, uid, gid):
'''
@@ -645,7 +649,12 @@ def __create_dogtag_log_dirs(self):
def restore_selinux_booleans(self):
bools = dict(httpinstance.SELINUX_BOOLEAN_SETTINGS)
if 'ADTRUST' in self.backup_services:
-bools.update(adtrustinstance.SELINUX_BOOLEAN_SETTINGS)
+if adtrustinstance:
+bools.update(adtrustinstance.SELINUX_BOOLEAN_SETTINGS)
+else:
+self.log.error(
+'The AD trust package was not found, '
+'not setting SELinux booleans.')
try:
tasks.set_selinux_booleans(bools)
except ipapython.errors.SetseboolError as e:
--
2.1.0
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
