X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=44d4974e9148d9c5ba9738be42531ef361c854ad;hp=765bb5e1d773dc12c7db392a3b4771a43915d2a6;hb=3e119b381a67261e2b70646117f29bd799c776c1;hpb=6addd55ab153402a7e5f39c71e3266b8eab54de5

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index 765bb5e..44d4974 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # 
 # django-ldapdb
-# Copyright (c) 2009-2010, Bolloré telecom
+# Copyright (c) 2009-2011, Bolloré telecom
 # All rights reserved.
 # 
 # See AUTHORS file for a full list of contributors.
@@ -33,7 +33,6 @@
 #
 
 from django.conf import settings
-from ldapdb.backends.ldap.base import DatabaseWrapper
 
 def escape_ldap_filter(value):
     value = unicode(value)
@@ -43,9 +42,17 @@ def escape_ldap_filter(value):
                 .replace(')', '\\29') \
                 .replace('\0', '\\00')
 
-# FIXME: is this the right place to initialize the LDAP connection?
-connection = DatabaseWrapper({
-    'NAME': settings.LDAPDB_SERVER_URI,
-    'USER': settings.LDAPDB_BIND_DN,
-    'PASSWORD': settings.LDAPDB_BIND_PASSWORD}, '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())