[X2Go-Commits] [x2gobroker] 03/03: x2gobroker/authmechs/pam_authmech.py: port pam.pam change to this file as well.
git-admin at x2go.org
git-admin at x2go.org
Sun Jul 10 04:30:39 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit d68ec356ba142b9b5f127edf99e4fce1232098af
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Jul 10 04:28:36 2016 +0200
x2gobroker/authmechs/pam_authmech.py: port pam.pam change to this file as well.
---
debian/changelog | 2 ++
x2gobroker/authmechs/pam_authmech.py | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2c4ebe3..41180fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2gobroker (0.0.3.1-0x2go1) UNRELEASED; urgency=low
* New upstream version (0.0.3.1):
- sbin/x2gobroker-authservice: refactor pam.pam section a bit. Always
initialize opam with pam and only rewrite it with pam.pam if necessary.
+ - x2gobroker/authmechs/pam_authmech.py: port pam.pam change to this file
+ as well.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py
index 9e992fa..038be70 100644
--- a/x2gobroker/authmechs/pam_authmech.py
+++ b/x2gobroker/authmechs/pam_authmech.py
@@ -40,7 +40,10 @@ class X2GoBrokerAuthMech(object):
logger_error.error('Authentication against authentication service failed, trying direct PAM authentication (which is likely to fail on most PAM setups).')
logger_error.error('Make sure the current user ({user}) is allowed to use the PAM authentication mechanism.'.format(user=getpass.getuser()))
# fallback to direct PAM authentication against the PAM service ,,x2gobroker''
- if pam.authenticate(username, password, service="x2gobroker"):
+ opam = pam
+ if pam.pam:
+ opam = pam.pam()
+ if opam.authenticate(username, password, service="x2gobroker"):
return True
return False
--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list