mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
ipa-restore: Don't crash if AD trust is not installed
https://fedorahosted.org/freeipa/ticket/4668 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
committed by
Jan Cholasta
parent
82c3c2b242
commit
a8e2a242be
@@ -37,13 +37,17 @@ from ipaserver.install.replication import (wait_for_task, ReplicationManager,
|
||||
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 @@ class Restore(admintool.AdminTool):
|
||||
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:
|
||||
|
||||
Reference in New Issue
Block a user