6 files changed, 75 insertions, 15 deletions
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index 713b132f..fc7b1200 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -22,7 +22,7 @@ class Mysql(Plugin):
     plugin_name = "mysql"
 
     def setup(self):
-        super(mysql, self).setup()
+        super(Mysql, self).setup()
 
 class RedHatMysql(Mysql, RedHatPlugin):
     """MySQL related information for RedHat based distributions
@@ -39,7 +39,7 @@ class RedHatMysql(Mysql, RedHatPlugin):
             "/etc/ld.so.conf.d/mysql*",
             "/var/log/mysql*"])
 
-class DebianMysql(mysql, DebianPlugin, UbuntuPlugin):
+class DebianMysql(Mysql, DebianPlugin, UbuntuPlugin):
     """MySQL related information for Debian based distributions
     """
 
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 812e20da..83dc6b22 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -27,7 +27,10 @@ class named(Plugin, RedHatPlugin):
         """ grab directory path from named{conf,boot}
         """
         directory_list = self.do_regex_find_all("directory\s+\"(.*)\"", config_file)
-        return normpath(directory_list[0])
+        if directory_list:
+            return normpath(directory_list[0])
+        else:
+            return ""
 
     def setup(self):
         config_files = ("/etc/named.conf",
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py
index c87a61b1..86fcd115 100644
--- a/sos/plugins/ntp.py
+++ b/sos/plugins/ntp.py
@@ -12,14 +12,33 @@
 ## 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
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class ntp(Plugin, RedHatPlugin):
+class Ntp(Plugin):
     """NTP related information
     """
 
+    plugin_name = "ntp"
+
     packages = ('ntp',)
 
     def setup(self):
-        self.add_cmd_output("/usr/bin/ntpstat")
         self.add_cmd_output("/usr/sbin/ntptime")
+
+class RedHatNtp(Ntp, RedHatPlugin):
+    """NTP related information for RedHat based distributions
+    """
+
+    def setup(self):
+        super(RedHatNtp, self).setup()
+        self.add_cmd_output("/usr/bin/ntpstat")
+
+class DebianNtp(Ntp, DebianPlugin, UbuntuPlugin):
+    """NTP related information for Debian based distributions
+    """
+
+    def setup(self):
+        super(DebianNtp, self).setup()
+        self.add_copy_spec('/etc/default/ntp')
+
+
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index e7d72bd8..47f2b439 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -24,7 +24,7 @@ class Pam(Plugin):
         self.add_copy_spec("/etc/pam.d")
         self.add_copy_spec("/etc/security")
 
-class RedHatPam(pam, RedHatPlugin):
+class RedHatPam(Pam, RedHatPlugin):
     """PAM related information for RedHat based distribution
     """
     def setup(self):
@@ -32,7 +32,7 @@ class RedHatPam(pam, RedHatPlugin):
 
         self.add_cmd_output("/bin/ls -lanF /lib*/security")
 
-class DebianPam(pam, DebianPlugin, UbuntuPlugin):
+class DebianPam(Pam, DebianPlugin, UbuntuPlugin):
     """PAM related information for Debian based distribution
     """
     def setup(self):
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index 0d7a671c..ed8e2fdd 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -12,19 +12,39 @@
 ## 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
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 from os.path import exists
 
-class postfix(Plugin, RedHatPlugin):
+class Postfix(Plugin):
     """mail server related information
     """
+    plugin_name = "postfix"
 
-    files = ('/etc/rc.d/init.d/postfix',)
     packages = ('postfix',)
 
     def setup(self):
         self.add_copy_specs([
-            "/etc/mail",
             "/etc/postfix/main.cf",
             "/etc/postfix/master.cf"])
         self.add_cmd_output("/usr/sbin/postconf")
+
+class RedHatPostfix(Postfix, RedHatPlugin):
+    """mail server related information for RedHat based distributions
+    """
+
+    files = ('/etc/rc.d/init.d/postfix',)
+    packages = ('postfix',)
+
+    def setup(self):
+        super(RedHatPostfix, self).setup()
+        self.add_copy_spec("/etc/mail")
+
+class DebianPostfix(Postfix, DebianPlugin, UbuntuPlugin):
+    """mail server related information for Debian based Distribution
+    """
+
+    packages = ('postfix',)
+
+    def setup(self):
+        super(DebianPostfix, self).setup()
+        self.add_copy_spec("/etc/postfix/dynamicmaps.cf")
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index 63aac8e6..177c0e26 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -14,15 +14,33 @@
 ## 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
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 from os.path import exists
 
-class snmp(Plugin, RedHatPlugin):
+class Snmp(Plugin):
     """snmp related information
     """
+    plugin_name = "snmp"
 
     files = ('/etc/snmp/snmpd.conf',)
-    packages = ('net-snmp',)
 
     def setup(self):
         self.add_copy_spec("/etc/snmp")
+
+class RedHatSnmp(Snmp, RedHatPlugin):
+    """snmp related information for RedHat based distributions
+    """
+
+    packages = ('net-snmp',)
+
+    def setup(self):
+        super(RedHatSnmp, self).setup()
+
+class DebianSnmp(Snmp, DebianPlugin, UbuntuPlugin):
+    """snmp related information for Debian based distributions
+    """
+
+    packages = ('snmp',)
+
+    def setup(self):
+        super(DebianSnmp, self).setup()