[X2Go-Commits] [x2gobroker] 01/01: x2gobroker-authservice: fixup 60db077d1. The hasattr() call takes a string as its second parameter.

git-admin at x2go.org git-admin at x2go.org
Thu Feb 16 06:45:44 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit a068f0d196e8e9278184b84cfeba5672fcebe2e1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Feb 16 06:45:25 2017 +0100

    x2gobroker-authservice: fixup 60db077d1. The hasattr() call takes a string as its second parameter.
---
 debian/changelog                     |    5 +++++
 x2gobroker/authmechs/pam_authmech.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index acc86e5..297afba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ x2gobroker (0.0.3.2-0x2go1) UNRELEASED; urgency=medium
   * x2gobroker-testagent:
     - Fix setting up remote_agent[] dictionary. Follow-up fix for a9bc46b.
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.0.3.2):
+    - x2gobroker-authservice: fixup 60db077d1. The hasattr() call takes a
+      string as its second parameter.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 01 Dec 2016 23:07:26 +0100
 
 x2gobroker (0.0.3.1-0x2go1) unstable; urgency=low
diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py
index b6ff7db..3486d65 100644
--- a/x2gobroker/authmechs/pam_authmech.py
+++ b/x2gobroker/authmechs/pam_authmech.py
@@ -41,7 +41,7 @@ class X2GoBrokerAuthMech(object):
                 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''
                 opam = pam
-                if hasattr(pam, pam):
+                if hasattr(pam, "pam"):
                     opam = pam.pam()
                 if opam.authenticate(username, password, service="x2gobroker"):
                     return True

--
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