13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
24 lines
976 B
Diff
24 lines
976 B
Diff
diff -up sos-2.2/sos/plugins/ldap.py.orig sos-2.2/sos/plugins/ldap.py
|
|
--- sos-2.2/sos/plugins/ldap.py.orig 2011-08-12 21:38:49.342684154 +0100
|
|
+++ sos-2.2/sos/plugins/ldap.py 2011-08-12 21:48:37.714760213 +0100
|
|
@@ -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
|