This fixes https://fedorahosted.org/freeipa/ticket/4678
--
Petr³
From bdeb005e8660868dc3faa0b15d04cb4954aef3b6 Mon Sep 17 00:00:00 2001
From: Petr Viktorin
Date: Tue, 18 Nov 2014 10:40:31 +0100
Subject: [PATCH] Do not restore SELinux settings that were not backed up
https://fedorahosted.org/freeipa/ticket/4678
---
ipaplatform/base/tasks.py | 3 ++-
ipaplatform/redhat/tasks.py | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ipaplatform/base/tasks.py b/ipaplatform/base/tasks.py
index 9b15119c4a1a1cc63e0e09ae436d8cec7c603fb9..ff71c2bd12be3b775a0ed43c8038ee3924d2c9f6 100644
--- a/ipaplatform/base/tasks.py
+++ b/ipaplatform/base/tasks.py
@@ -152,7 +152,8 @@ def set_selinux_booleans(self, required_settings, backup_func=None):
:param required_settings: A dictionary mapping the boolean names
to desired_values.
- The desired value can be 'on' or 'off'.
+ The desired value can be 'on' or 'off',
+ or None to leave the setting unchanged.
:param backup_func: A function called for each boolean with two
arguments: the name and the previous value
diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py
index cb0a27f73eb3269c32bb5f06aaf2b5bf23c4168e..b26604aa736eb472c88bc0dcbc3a4b515712ce9d 100644
--- a/ipaplatform/redhat/tasks.py
+++ b/ipaplatform/redhat/tasks.py
@@ -363,6 +363,8 @@ def get_setsebool_args(changes):
updated_vars = {}
failed_vars = {}
for setting, state in required_settings.iteritems():
+if state is None:
+continue
try:
(stdout, stderr, rc) = ipautil.run([paths.GETSEBOOL, setting])
original_state = stdout.split()[2]
--
2.1.0
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
