-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
THe name of this patch is wrong. Basically this patch will show the
booleans current state in the system and the state on disk.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk5yWJ8ACgkQrlYvE4MpobOSLgCeIJABmW3RpTuMwDg1zvp5Fw+q
jJYAn3DAZL/0E1/9NFlv/qJ3EMb41Rd5
=yUFy
-----END PGP SIGNATURE-----
>From 91de2cfea348c7a97fcbc59b4cf71646d9ed586f Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@xxxxxxxxxx>
Date: Fri, 26 Aug 2011 16:51:19 -0400
Subject: [PATCH 53/67] policycoreutils: semanage: FIXME Stop showing heading
if nothing is returned
FIXME: needs eparis review
Signed-off-by: Dan Walsh <dwalsh@xxxxxxxxxx>
---
policycoreutils/semanage/seobject.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py
index 6742fe9..4f6b1cf 100644
--- a/policycoreutils/semanage/seobject.py
+++ b/policycoreutils/semanage/seobject.py
@@ -1,5 +1,5 @@
#! /usr/bin/python -E
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat
+# Copyright (C) 2005-2011 Red Hat
# see file 'COPYING' for use and warranty information
#
# semanage is a tool for managing SELinux configuration files
@@ -1978,10 +1978,9 @@ class booleanRecords(semanageRecords):
print "%s=%s" % (k, ddict[k][2])
return
if heading:
- print "%-40s %s\n" % (_("SELinux boolean"), _("Description"))
+ print "%-30s %s %s %s\n" % (_("SELinux boolean"),_("State"), _("Default"), _("Description"))
ddict = self.get_all(locallist)
keys = ddict.keys()
for k in keys:
if ddict[k]:
- print "%-30s -> %-5s %s" % (k, on_off[ddict[k][2]], self.get_desc(k))
-
+ print "%-30s (%-5s,%5s) %s" % (k, on_off[selinux.security_get_boolean_active(k)], on_off[ddict[k][2]], self.get_desc(k))
--
1.7.6.2
