diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/source/format | 2 | ||||
| -rw-r--r-- | sos/plugins/selinux.py | 13 |
3 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index a7dde420..445bfafc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -sosreport (2.3-0~git20130509) unstable; urgency=low +sosreport (2.3~git20130509-1) unstable; urgency=low * Package updated from git rev 395ad13da8 Closes: #698329 - -- Adam Stokes <adam.stokes@ubuntu.com> Thu, 09 May 2013 20:06:50 -0400 + -- Adam Stokes <adam.stokes@ubuntu.com> Fri, 31 May 2013 12:12:46 -0400 diff --git a/debian/source/format b/debian/source/format index d3827e75..163aaf8d 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py index 699e5ff6..b7deae5a 100644 --- a/sos/plugins/selinux.py +++ b/sos/plugins/selinux.py @@ -20,16 +20,23 @@ class SELinux(Plugin, RedHatPlugin): plugin_name = 'selinux' - option_list = [("fixfiles", 'Print incorrect file context labels', 'slow', False)] + option_list = [("fixfiles", 'Print incorrect file context labels', 'slow', False), + ("list", 'List objects and their context', 'slow', False)] packages = ('libselinux',) def setup(self): # sestatus is always collected in check_enabled() self.add_copy_spec("/etc/selinux") - if self.get_option('fixfiles'): - self.add_cmd_output("fixfiles -v check") self.add_cmd_output("sestatus -b") + self.add_cmd_output("semodule -l") self.add_cmd_output("selinuxdefcon root") self.add_cmd_output("selinuxconlist root") self.add_cmd_output("selinuxexeccon /bin/passwd") + if self.get_option('fixfiles'): + self.add_cmd_output("fixfiles -v check") + if self.get_option('list'): + self.add_cmd_output("semanage fcontext -l") + self.add_cmd_output("semanage user -l") + self.add_cmd_output("semanage login -l") + self.add_cmd_output("semanage port -l") |