This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit a74403b987b943b23cc76955766ba5e59202e359 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 17 16:30:51 2014 +0100 Only sync password and passphrase if we do not enforce password authentication. --- debian/changelog | 2 ++ x2go/backends/control/plain.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d197cfc..03fcf56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ python-x2go (0.5.0.3-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.5.0.3): - Fix catching control session exceptions in X2GoSession class. - Catch EOFError in x2go_forward_tunnel_handle(). + - Only sync password and passphrase if we do not enforce password + authentication. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 13:15:44 +0100 diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index ea5b6e1..5915fb2 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -909,7 +909,7 @@ class X2GoControlSession(paramiko.SSHClient): pkey = None _twofactorauth = False - if password and (passphrase is None): passphrase = password + if password and (passphrase is None) and not force_password_auth: passphrase = password if use_sshproxy and sshproxy_host and sshproxy_user: try: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git