aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2011-08-15 09:05:00 +0100
committerBryn M. Reeves <bmr@redhat.com>2011-08-15 09:05:00 +0100
commit1338de0627686538f3ae877061a9c93c7779e5a7 (patch)
tree1a78a6264dac98a5b6353455e16fff49e2cb9c44
parent244cb47703180f4842376a78c410462d4f45c6f0 (diff)
downloadsos-1338de0627686538f3ae877061a9c93c7779e5a7.tar.gz
Collect nslcd.conf in ldap pluginsos-2.2-14.el6
Resolves: bz682124
-rw-r--r--sos/plugins/ldap.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index b1a48420..eb8a8c97 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -19,7 +19,7 @@ class ldap(sos.plugintools.PluginBase):
"""LDAP related information
"""
def checkenabled(self):
- self.packages = [ "openldap" ]
+ self.packages = [ "openldap", "nss-pam-ldapd" ]
self.files = [ "/etc/openldap/ldap.conf" ]
return sos.plugintools.PluginBase.checkenabled(self)
@@ -43,8 +43,10 @@ class ldap(sos.plugintools.PluginBase):
def setup(self):
self.addCopySpec("/etc/ldap.conf")
+ self.addCopySpec("/etc/nslcd.conf")
self.addCopySpec("/etc/openldap")
def postproc(self):
self.doRegexSub("/etc/ldap.conf", r"(\s*bindpw\s*)\S+", r"\1***")
+ self.doRegexSub("/etc/nslcd.conf", r"(\s*bindpw\s*)\S+", r"\1***")
return