IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor selinuxenabled check

Browse Source 
Ticket: https://fedorahosted.org/freeipa/ticket/4571
Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
This commit is contained in:
Francesco Marella 2014-09-26 14:07:25 +02:00 committed by Petr Viktorin
parent 915837c14a
commit f5b302be47
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ipaplatform/fedora/tasks.py
View File

@ -48,6 +48,22 @@ from ipaplatform.base.tasks import BaseTaskNamespace
log = log_mgr.get_logger(__name__) log = log_mgr.get_logger(__name__)
def selinux_enabled():
"""
Check if SELinux is enabled.
"""
if os.path.exists(paths.SELINUXENABLED):
try:
ipautil.run([paths.SELINUXENABLED])
return True
except ipautil.CalledProcessError:
# selinuxenabled returns 1 if not enabled
return False
else:
# No selinuxenabled, no SELinux
return False
class FedoraTaskNamespace(BaseTaskNamespace): class FedoraTaskNamespace(BaseTaskNamespace):
def restore_context(self, filepath, restorecon=paths.SBIN_RESTORECON): def restore_context(self, filepath, restorecon=paths.SBIN_RESTORECON):
@ -59,14 +75,8 @@ class FedoraTaskNamespace(BaseTaskNamespace):
ipautil.run() will do the logging. ipautil.run() will do the logging.
""" """
try:
if os.path.exists(paths.SELINUXENABLED): if not selinux_enabled():
ipautil.run([paths.SELINUXENABLED])
else:
# No selinuxenabled, no SELinux
return
except ipautil.CalledProcessError:
# selinuxenabled returns 1 if not enabled
return return
if (os.path.exists(restorecon)): if (os.path.exists(restorecon)):
@ -82,14 +92,7 @@ class FedoraTaskNamespace(BaseTaskNamespace):
This function returns nothing but may raise a Runtime exception This function returns nothing but may raise a Runtime exception
if SELinux is enabled but restorecon is not available. if SELinux is enabled but restorecon is not available.
""" """
try: if not selinux_enabled():
if os.path.exists(paths.SELINUXENABLED):
ipautil.run([paths.SELINUXENABLED])
else:
# No selinuxenabled, no SELinux
return
except ipautil.CalledProcessError:
# selinuxenabled returns 1 if not enabled
return return
if not os.path.exists(restorecon): if not os.path.exists(restorecon):
@ -354,13 +357,7 @@ class FedoraTaskNamespace(BaseTaskNamespace):
return args return args
if (os.path.exists(paths.SELINUXENABLED)): if not selinux_enabled():
try:
ipautil.run([paths.SELINUXENABLED])
except ipautil.CalledProcessError:
# selinuxenabled returns 1 if not enabled
return False
else:
return False return False
updated_vars = {} updated_vars = {}