github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1527 from modoboa/fix/authentication_backends

Browse Source 
Fix attempt for #1510.
This commit is contained in:
Antoine Nguyen
2018-07-10 11:47:16 +02:00
committed by GitHub
parent 4d00ea3981 0f98d9548c
commit 1ce99017fc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/lib/authbackends.py
+3 -4
View File
@@ -16,7 +16,7 @@ from modoboa.parameters import tools as param_tools
class SMTPBackend(object):
"""A backend to authenticate against an SMTP server."""
def authenticate(self, username=None, password=None):
def authenticate(self, request, username=None, password=None):
"""Check the username/password and return a User."""
host = getattr(settings, "AUTH_SMTP_SERVER_ADDRESS", "localhost")
port = getattr(settings, "AUTH_SMTP_SERVER_PORT", 25)
@@ -113,10 +113,9 @@ try:
pass
return user
def authenticate(self, username, password):
def authenticate(self, *args, **kwargs):
if self.global_params["authentication_type"] == "ldap":
return super(LDAPBackend, self).authenticate(
username=username, password=password)
return super(LDAPBackend, self).authenticate(*args, **kwargs)
return None
except ImportError: