http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89633
Revision: 89633
Author: laner
Date: 2011-06-07 08:41:38 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
fallback to /etc/ldap/ldap.conf if /etc/ldap.conf doesn't exist
Modified Paths:
--------------
trunk/tools/subversion/user-management/ldapsupportlib.py
Modified: trunk/tools/subversion/user-management/ldapsupportlib.py
===================================================================
--- trunk/tools/subversion/user-management/ldapsupportlib.py 2011-06-07
08:20:28 UTC (rev 89632)
+++ trunk/tools/subversion/user-management/ldapsupportlib.py 2011-06-07
08:41:38 UTC (rev 89633)
@@ -81,7 +81,13 @@
return self.ldapHost
def getLdapInfo(self, attr, conffile="/etc/ldap.conf"):
- f = open(conffile)
+ try:
+ f = open(conffile)
+ except IOError:
+ if conffile == "/etc/ldap.conf":
+ # fallback to /etc/ldap/ldap.conf, which will
likely
+ # have less information
+ f = open("/etc/ldap/ldap.conf")
for line in f:
if line.strip() == "":
continue
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
