--- puppet/modules/transifex/templates/45-ldap.conf	2010/12/15 16:15:46	631
+++ puppet/modules/transifex/templates/45-ldap.conf	2010/12/15 21:24:26	632
@@ -1,5 +1,5 @@
 AUTHENTICATION_BACKENDS = (
-    'django_auth_ldap.backend.LDAPBackend',
+    'custom_backend.ForceUidLDAPBackend',
     'django.contrib.auth.backends.ModelBackend',
 )
 
@@ -23,7 +23,7 @@
 AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>"
 
 AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ",
-    ldap.SCOPE_SUBTREE, "(uid=%(user)s)")
+    ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))")
 
 # Set up the basic group parameters.
 AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>",