X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=7dde301da3532915ec9e0a099a8b881026038f6c;hp=765bb5e1d773dc12c7db392a3b4771a43915d2a6;hb=9c4c98c24a7c0300ba09218b12833426d9bbb88f;hpb=0dcc0b21337a6bf4859c2a4f13c1951accf7639e diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py index 765bb5e..7dde301 100644 --- a/ldapdb/__init__.py +++ b/ldapdb/__init__.py @@ -33,7 +33,7 @@ # from django.conf import settings -from ldapdb.backends.ldap.base import DatabaseWrapper +from django.db import connections def escape_ldap_filter(value): value = unicode(value) @@ -43,9 +43,11 @@ def escape_ldap_filter(value): .replace(')', '\\29') \ .replace('\0', '\\00') -# FIXME: is this the right place to initialize the LDAP connection? -connection = DatabaseWrapper({ +# 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}, 'ldap') + 'PASSWORD': settings.LDAPDB_BIND_PASSWORD} +connection = connections['ldap']