[X2Go-Commits] [x2gobroker] 02/03: sbin/x2gobroker-authservice: refactor pam.pam section a bit.

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 5932f1e7610439bf4f8f29f6bcc56d27f064f164
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jul 10 04:27:00 2016 +0200

    sbin/x2gobroker-authservice: refactor pam.pam section a bit.
    
    Always initialize opam with pam and only rewrite it with pam.pam if
    necessary.
---
 debian/changelog            |    2 ++
 sbin/x2gobroker-authservice |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 466985c..2c4ebe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2gobroker (0.0.3.1-0x2go1) UNRELEASED; urgency=low
 
   [ Mihai Moldovan ]
   * 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.
   * 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/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice
index bccbde2..00decb1 100755
--- a/sbin/x2gobroker-authservice
+++ b/sbin/x2gobroker-authservice
@@ -78,10 +78,9 @@ class AuthClient(asyncore.dispatcher_with_send):
                 self.send('bad\n')
                 self.logger.warning('bad authentication data received')
             else:
+                opam = pam
                 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))

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