X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=1aa900725a59d96dd9ae987f23b060aee1bab0f9;hp=cfa1dd3bfa7af423d0271df12db3a78c0867810a;hb=9e27d57f8a65302eff3a71564b454b1dc8efce80;hpb=9a3c42aac1ccc9b34c4ec4b300d07b003c439248

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index cfa1dd3..1aa9007 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -32,11 +32,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-from django import db
 from django.conf import settings
 
-from ldapdb.router import Router
-
 def escape_ldap_filter(value):
     value = unicode(value)
     return value.replace('\\', '\\5c') \
@@ -45,13 +42,17 @@ def escape_ldap_filter(value):
                 .replace(')', '\\29') \
                 .replace('\0', '\\00')
 
-# Add the LDAP backend
-settings.DATABASES['ldap'] = {
-    'ENGINE': 'ldapdb.backends.ldap',
-    'NAME': settings.LDAPDB_SERVER_URI,
-    'USER': settings.LDAPDB_BIND_DN,
-    'PASSWORD': settings.LDAPDB_BIND_PASSWORD}
-connection = db.connections['ldap']
+# Legacy single database support
+if hasattr(settings, 'LDAPDB_SERVER_URI'):
+    from django import db
+    from ldapdb.router import Router
+
+    # Add the LDAP backend
+    settings.DATABASES['ldap'] = {
+        'ENGINE': 'ldapdb.backends.ldap',
+        'NAME': settings.LDAPDB_SERVER_URI,
+        'USER': settings.LDAPDB_BIND_DN,
+        'PASSWORD': settings.LDAPDB_BIND_PASSWORD}
 
-# Add the LDAP router
-db.router.routers.append(Router())
+    # Add the LDAP router
+    db.router.routers.append(Router())