[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.0-12-g5120097

[X2go dev team]

The branch, master has been updated
       via  5120097388392ff56602e771037ad7ad261a33a1 (commit)
      from  acc0632ba462e6e3be91bb70e812c00fcfb176c6 (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 5120097388392ff56602e771037ad7ad261a33a1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 29 16:41:15 2012 +0100

    The default of a 10 seconds SSH connection timeout is pretty low, especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout.

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

Summary of changes:
 debian/changelog        |    3 +++
 sshmasterconnection.cpp |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4c32c71..cbdbd57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low
     - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with
       Leopard.
     - Add .gitignore file.
+    - The default of a 10 seconds SSH connection timeout is pretty low,
+      especially when using tcp_wrappers with the identd option turned on.
+      Wait for a 60 seconds timeout.
 
   [ Daniel Lindgren ]
   * New upstream version (3.99.1.1):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 2626346..9c6626a 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -137,6 +137,7 @@ void SshMasterConnection::run()
 #endif
 
 //     int verbosity=SSH_LOG_PROTOCOL;
+    long timeout = 60;
 
     my_ssh_session = ssh_new();
     if ( my_ssh_session == NULL )
@@ -153,6 +154,9 @@ void SshMasterConnection::run()
     ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii());
 #endif
 //     ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
+
+    ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout);
+
     if ( !sshConnect() )
     {
         QString err=ssh_get_error ( my_ssh_session );


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).