[X2Go-Commits] [x2gobroker] 01/03: sbin/x2gobroker-authservice: adapt script to correctly use the newer python-pam module, which now exposes functionality in pam.pam with backwards compatibility. Fixes: #1056.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit fbb5600f7858d387e15ce289bcfd33158047c188
Author: Walid Moghrabi <w.moghrabi at servicemagic.eu>
Date:   Sun Jul 10 04:07:20 2016 +0200

    sbin/x2gobroker-authservice: adapt script to correctly use the newer python-pam module, which now exposes functionality in pam.pam with backwards compatibility. Fixes: #1056.
---
 debian/changelog            |    6 ++++++
 sbin/x2gobroker-authservice |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 91dae8d..466985c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ x2gobroker (0.0.3.1-0x2go1) UNRELEASED; urgency=low
     - Uploaders: add myself. Also, force a rebuild due to the changed
       versioning.
 
+  [ Walid Moghrabi ]
+  * New upstream version (0.0.3.1):
+    - sbin/x2gobroker-authservice: adapt script to correctly use the newer
+      python-pam module, which now exposes functionality in pam.pam with
+      backwards compatibility. Fixes: #1056.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 19 Jul 2015 21:58:43 +0200
 
 x2gobroker (0.0.3.0-0x2go1) unstable; urgency=low
diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice
index be6ea4b..bccbde2 100755
--- a/sbin/x2gobroker-authservice
+++ b/sbin/x2gobroker-authservice
@@ -78,7 +78,11 @@ class AuthClient(asyncore.dispatcher_with_send):
                 self.send('bad\n')
                 self.logger.warning('bad authentication data received')
             else:
-                if pam.authenticate(user, passwd, service):
+                if pam.pam:
+                    opam = pam.pam()
+                else:
+                    opam = pam
+                if opam.authenticate(user, passwd, service):
                     self.send('ok\n')
                     self.logger.info('successful authentication for \'{user}\' with password \'<hidden>\' against PAM service \'{service}\''.format(user=user, service=service))
                 else:

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git