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

[X2Go dev team]

The branch, master has been updated
       via  fe4408b12c982b81c56c52f37230865f4e9f41ea (commit)
       via  b4c481184a307d9b522542814f838067e2e78bf3 (commit)
      from  cfa1e28665a8fa2f34f7546af7bd8d25ea1ba8bd (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 fe4408b12c982b81c56c52f37230865f4e9f41ea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 22 00:18:21 2013 +0200

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

commit b4c481184a307d9b522542814f838067e2e78bf3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 22 00:14:58 2013 +0200

    changelog cleanup

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index dbe9045..9be4d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
 
   [ Oleksandr Shneyder ]
-  * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname
-    resolution. (Fixes: #151).
-    - waiting for x2gocmdexitmessage to return before closing in hidden mode
+  * New upstream version (4.0.1.0):
+    - Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname
+      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
 
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).