tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #280 from fatlotus/patch-1

Browse Source 
Add compatibility patch for .authenticate() in PAM authentication module
This commit is contained in:
Guillaume Ayoub
2015-04-20 10:27:16 +02:00
parent a7700f9805 dd01087520
commit ab77f62bf4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/auth/PAM.py
View File

@@ -33,6 +33,11 @@ from .. import config, log
GROUP_MEMBERSHIP = config.get("auth", "pam_group_membership") GROUP_MEMBERSHIP = config.get("auth", "pam_group_membership")
# Compatibility patch for old versions of python-pam.
if not hasattr(pam, "pam"):
pam.pam = (lambda *vargs, **kwargs: pam.authenticate(*vargs, **kwards))
def is_authenticated(user, password): def is_authenticated(user, password):
"""Check if ``user``/``password`` couple is valid.""" """Check if ``user``/``password`` couple is valid."""
if user is None or password is None: if user is None or password is None:
@@ -72,7 +77,7 @@ def is_authenticated(user, password):
"The PAM user belongs to the required group (%s)" % "The PAM user belongs to the required group (%s)" %
GROUP_MEMBERSHIP) GROUP_MEMBERSHIP)
# Check the password # Check the password
if pam.authenticate(user, password): if pam.pam().authenticate(user, password):
return True return True
else: else:
log.LOGGER.debug("Wrong PAM password") log.LOGGER.debug("Wrong PAM password")