[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-21-g3c5222d

[X2Go dev team]

The branch, master has been updated
       via  3c5222db2ea16590f6f80833547ac9b41c0d660b (commit)
      from  7b90207804eeba8b0f4674f46312fe44e40343cc (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 3c5222db2ea16590f6f80833547ac9b41c0d660b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 7 20:07:07 2013 +0200

    Avoid multiple selectUserSession requests when in broker mode.

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

Summary of changes:
 debian/changelog |    2 ++
 onmainwindow.cpp |   16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5a78aef..afa6b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       Let's consider a given SSH private key that fails to log the user
       in as an overall login failure. (Fixes: #141).
     - Enable full access desktop sharing across user accounts.
+    - Avoid multiple selectUserSession requests when in broker
+      mode.
 
   [ Ezra Bühler ]
   * New upstream version (4.0.1.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index a307bb7..71b9e1d 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -992,7 +992,7 @@ void ONMainWindow::slotGetBrokerAuth()
     }
     if(config.brokerNoAuth)
         slotSessEnter();
-    if(config.brokerurl.indexOf("ssh://")==0 && (config.brokerAutologin || config.brokerSshKey.length()>0))
+    else if(config.brokerurl.indexOf("ssh://")==0 && (config.brokerAutologin || config.brokerSshKey.length()>0))
         slotSessEnter();
 }
 
@@ -2731,23 +2731,23 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
 
 ///////////////////////////////////////////////////
 
+    if ( currentKey.length() >0 )
+    {
+        nopass=true;
+    }
     if(brokerMode &&usebrokerpass)
     {
         pass->setText(config.brokerPass);
         slotSessEnter();
     }
-
-    if ( currentKey.length() >0 )
-    {
-        nopass=true;
-    }
-    if ( currentKey != QString::null && currentKey != "" && nopass )
+    else if ( currentKey != QString::null && currentKey != "" && nopass )
     {
         x2goDebug<<"Starting session with key.";
         slotSessEnter();
     }
-    if ( cardReady || autologin || krblogin  )
+    else if ( cardReady || autologin || krblogin  )
     {
+        x2goDebug<<"Starting session via smartcard, ssh-agent or kerberos token.";
         nopass=true;
         if ( cardReady )
             login->setText ( cardLogin );


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