From 9042ad455c31ad4cb007b1b34f7d475331ef99e0 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Thu, 1 Aug 2013 16:43:43 +0100
Subject: Split kerberos data collection into separate plug-in

The krb5 data collection in the samba plug-in is misplaced. Since
this is collecting information about the system keytab move it
to its own plug-in that can be activated on any kerberos enabled
system.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/krb5.py  | 29 +++++++++++++++++++++++++++++
 sos/plugins/samba.py | 19 ++-----------------
 2 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 sos/plugins/krb5.py

diff --git a/sos/plugins/krb5.py b/sos/plugins/krb5.py
new file mode 100644
index 00000000..d9dca896
--- /dev/null
+++ b/sos/plugins/krb5.py
@@ -0,0 +1,29 @@
+## Copyright (C) 2013 Red Hat, Inc., Bryn M. Reeves <bmr@redhat.com>
+
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+
+class Krb5(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+    """Kerberos related information
+    """
+    packages = ('krb5-libs', 'krb5-user')
+    plugin_name = 'krb5'
+
+    def setup(self):
+        self.add_copy_specs([
+            "/etc/krb5.conf",
+            "/etc/krb5.keytab"])
+
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index f3a44b77..f3dc8628 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -14,9 +14,10 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class Samba(Plugin):
+class Samba(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Samba related information
     """
+    packages = ('samba-common',)
     plugin_name = "samba"
 
     def setup(self):
@@ -27,19 +28,3 @@ class Samba(Plugin):
         self.add_cmd_output("wbinfo --domain='.' -u")
         self.add_cmd_output("testparm -s -v")
 
-
-class RedHatSamba(Samba, RedHatPlugin):
-    """Samba related information for RedHat based distributions
-    """
-    def setup(self):
-        super(RedHatSamba, self).setup()
-        # FIXME: krb5 specific
-        self.add_copy_specs([
-            "/etc/krb5.conf",
-            "/etc/krb5.keytab"])
-
-class DebianSamba(Samba, DebianPlugin, UbuntuPlugin):
-    """Samba related information for Debian based distributions
-    """
-    def setup(self):
-        super(DebianSamba, self).setup()
-- 
cgit