[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.37.0-50-g35b1dee

[X2Go dev team]

The branch, brokerclient has been updated
       via  35b1deedef5787b3e92c3a9555841a544e7293d9 (commit)
      from  1fdccab8a4af1f3da5c651cabb5d1d556eda983d (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:
 x2go/checkhosts.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index 51485f4..4d47f17 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -47,13 +47,14 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
     def missing_host_key(self, client, hostname, key):
         self.client = client
         self.hostname = hostname
-        if not self.hostname.find(':'):
-            self.hostname += ':22'
+        if (self.hostname.find(']') == -1) and (self.hostname.find(':') == -1):
+            # if hostname is an IPv4 quadruple...
+            self.hostname = '[%s]:22' % self.hostname
         self.key = key
         client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' %
-                   (key.get_name(), hostname, binascii.hexlify(key.get_fingerprint())))
+                   (self.key.get_name(), self.hostname, binascii.hexlify(self.key.get_fingerprint())))
         if self.session_instance:
-            self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2go server for the first time.' % (hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
+            self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
             _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(),
                                                                   port=self.get_hostname_port(),
                                                                   fingerprint=self.get_key_fingerprint_with_colons(),
@@ -73,6 +74,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
         return self.client
 
     def get_hostname(self):
+    	print self.hostname
         return self.hostname
 
     def get_hostname_name(self):


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