X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2F__init__.py;h=dde6304e1b5d0cf8331f60ecb7d0164c3a25ff6c;hb=b1bbd52d06dd8c9160ae925b5c407f642f2698c1;hp=7dde301da3532915ec9e0a099a8b881026038f6c;hpb=9c4c98c24a7c0300ba09218b12833426d9bbb88f;p=matthijs%2Fupstream%2Fdjango-ldapdb.git diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py index 7dde301..dde6304 100644 --- a/ldapdb/__init__.py +++ b/ldapdb/__init__.py @@ -32,8 +32,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +from django import db from django.conf import settings -from django.db import connections + +from ldapdb.router import Router def escape_ldap_filter(value): value = unicode(value) @@ -43,11 +45,15 @@ def escape_ldap_filter(value): .replace(')', '\\29') \ .replace('\0', '\\00') -# Add the LDAP backend to the configured databases -settings.DATABASES['ldap'] = { - 'ENGINE': 'ldapdb.backends.ldap', - 'NAME': settings.LDAPDB_SERVER_URI, - 'USER': settings.LDAPDB_BIND_DN, - 'PASSWORD': settings.LDAPDB_BIND_PASSWORD} -connection = connections['ldap'] +# Legacy single database support +if hasattr(settings, 'LDAPDB_SERVER_URI'): + # 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'] + # Add the LDAP router + db.router.routers.append(Router())