[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-19-g81ed5e7

[X2Go dev team]

The branch, twofactorauth has been updated
       via  81ed5e7d2886aa67e03655d3669011096b4c944e (commit)
      from  5466f298a3da2e0465592c29954554842eb09b6f (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 -----------------------------------------------------------------
commit 81ed5e7d2886aa67e03655d3669011096b4c944e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 17 23:43:51 2013 +0200

    fix some debug messages

-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/control/_stdout.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 638b5b9..e72b9ee 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -906,20 +906,18 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
                                                            key_filename=key_filename, timeout=timeout, allow_agent=False,
                                                            look_for_keys=False)
                             except TypeError:
-                                if password and passphrase and password != passphrase:
-                                    self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN)
+                                self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_NOTICE)
                                 paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey,
                                                            key_filename=key_filename, timeout=timeout, allow_agent=False,
                                                            look_for_keys=False)
                         else:
-                            self.logger('re-trying SSH key discovery or agent authentication with server', loglevel=log.loglevel_DEBUG)
+                            self.logger('re-trying SSH key discovery now with passphrase for unlocking the key(s)', loglevel=log.loglevel_DEBUG)
                             try:
                                 paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, passphrase=passphrase, pkey=None,
                                                            key_filename=None, timeout=timeout, allow_agent=allow_agent,
                                                            look_for_keys=look_for_keys)
                             except TypeError:
-                                if password and passphrase and password != passphrase:
-                                    self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN)
+                                self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_NOTICE)
                                 paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=None,
                                                            key_filename=None, timeout=timeout, allow_agent=allow_agent,
                                                            look_for_keys=look_for_keys)


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