[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.2.0.10-91-g8b51f44

[X2Go dev team]

The branch, release/0.4.0.x has been updated
       via  8b51f4435d5042e8f8a3d38767d8cf70d38a67b6 (commit)
      from  54e4dbcf1b1b740eb5fff25d8f308a4331ba616f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    2 ++
 x2go/backends/control/_stdout.py |    7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 469efd4..2d2122e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       folders.
     - Before suspending/terminating a session, make sure that the list of
       shared folders is up-to-date.
+    - Fix password authentication in case no private RSA/DSA key for a
+      client user exists.
   * /debian/rules:
     + Allow package build on systems with missing dh_python2.
   * /debian/control:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index cb309ad..b95e916 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -803,11 +803,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     try:
                         paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password,
                                                    key_filename=None, pkey=None, timeout=timeout, allow_agent=False, look_for_keys=False)
-                    except paramiko.AuthenticationException, e:
-                        self.close()
-                        if self.sshproxy_session:
-                            self.sshproxy_session.stop_thread()
-                        raise(e)
                     except:
                         self.close()
                         if self.sshproxy_session:
@@ -817,7 +812,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     self.close()
                     if self.sshproxy_session:
                         self.sshproxy_session.stop_thread()
-                    raise(e)
+                    raise(paramiko.AuthenticationException('Interactive password authentication required!'))
 
             except:
                 self.close()


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).