From 50f5c8ab7b7020f6e679cd5a6d965da8017ef48a Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Thu, 24 Nov 2011 21:03:46 +0000 Subject: Replace setting ldap/uri or /uri with /ldap_uri --- pykolab/auth/ldap/__init__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py index 7c447f4..f725d87 100644 --- a/pykolab/auth/ldap/__init__.py +++ b/pykolab/auth/ldap/__init__.py @@ -141,12 +141,19 @@ class LDAP(object): if domain == None: section = 'ldap' - elif not conf.has_option(domain, 'uri'): - section = 'ldap' + key = 'uri' + + if conf.has_option(domain, 'uri'): + log.warning(_("Deprecation: Setting 'uri' for LDAP in section %s needs to be updated to 'ldap_uri'") %(domain)) + section = domain + key = 'uri' + elif conf.has_option(domain, 'ldap_uri'): + section = domain + key = 'ldap_uri' log.debug(_("Connecting to LDAP..."), level=8) - uri = conf.get(section, 'uri') + uri = conf.get(section, key) log.debug(_("Attempting to use LDAP URI %s") %(uri), level=8) -- cgit v1.1