From 3babdf190b9622b1ee49330d6a1c3fde0966d962 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Wed, 20 Jun 2012 15:33:45 -0400 Subject: [PATCH] policycoreutils: semanage: use boolean subs. This fixes a problem in xguest which is using the old name of the boolean an blowing up on install. Signed-off-by: Eric Paris --- policycoreutils/semanage/seobject.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py index 8deb6560..8ed26860 100644 --- a/policycoreutils/semanage/seobject.py +++ b/policycoreutils/semanage/seobject.py @@ -2018,9 +2018,9 @@ class booleanRecords(semanageRecords): semanage_bool_free(b) def modify(self, name, value = None, use_file = False): - - self.begin() + name = selinux.selinux_boolean_sub(name) + self.begin() if use_file: fd = open(name) for b in fd.read().split("\n"): @@ -2040,6 +2040,7 @@ class booleanRecords(semanageRecords): self.commit() def __delete(self, name): + name = selinux.selinux_boolean_sub(name) (rc, k) = semanage_bool_key_create(self.sh, name) if rc < 0: @@ -2103,14 +2104,16 @@ class booleanRecords(semanageRecords): return ddict - def get_desc(self, boolean): - return boolean_desc(boolean) + def get_desc(self, name): + name = selinux.selinux_boolean_sub(name) + return boolean_desc(name) - def get_category(self, boolean): - if boolean in booleans_dict: - return _(booleans_dict[boolean][0]) - else: - return _("unknown") + def get_category(self, name): + name = selinux.selinux_boolean_sub(name) + if name in booleans_dict: + return _(booleans_dict[name][0]) + else: + return _("unknown") def customized(self): l = []