[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.0-7-gfe4408b

[X2Go dev team]

The branch, build-main has been updated
       via  fe4408b12c982b81c56c52f37230865f4e9f41ea (commit)
      from  b4c481184a307d9b522542814f838067e2e78bf3 (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        |    6 ++++++
 sshmasterconnection.cpp |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3470042..9be4d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       resolution. (Fixes: #151).
     - Wait for x2gocmdexitmessage to return before closing in hidden mode.
 
+  [ Mike Gabriel ]
+  * New upstream version (4.0.1.0):
+    - If a priv SSH key has been specified, skip the autologin procedure.
+      Let's consider a given SSH private key that fails to log the user
+      in as an overall login failure. (Fixes: 141).
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Mar 2013 23:21:11 +0100
 
 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 196cec0..eb75237 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -847,7 +847,7 @@ bool SshMasterConnection::userAuthWithKey()
 
 bool SshMasterConnection::userAuth()
 {
-    if ( autologin )
+    if ( autologin && key=="" )
         if ( userAuthAuto() )
             return true;
     if ( key!="" )


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