[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-45-g61958d4

[X2Go dev team]

The branch, master has been updated
       via  61958d4701d4d9e567e116acaceca9333dde3737 (commit)
      from  2b2b554e4bc828ff2ded8fe9f64f157ac49c44cb (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 61958d4701d4d9e567e116acaceca9333dde3737
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 18 19:59:14 2013 +0200

    Make X2Go Client work in SSH broker mode without the need of a auth-id file.

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

Summary of changes:
 debian/changelog     |    2 ++
 httpbrokerclient.cpp |   36 ++++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 43d9efe..72a7201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       (Fixes: #179).
     - Enable full access desktop sharing across user accounts. (Fixes: #222).
     - Make X2Go Client aware of the MATE desktop environment.
+    - Make X2Go Client work in SSH broker mode without the need of a auth-id
+      file.
 
   [ Heinrich Schuchardt ]
   * New upstream version (4.0.1.1):
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 3093a48..35f87d0 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -243,8 +243,13 @@ void HttpBrokerClient::getUserSessions()
             createSshConnection();
             return;
         }
-        sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task listsessions",
-                                        this, SLOT ( slotListSessions ( bool, QString,int ) ));
+        if (config->brokerUserId.length() > 0) {
+            sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task listsessions",
+                                            this, SLOT ( slotListSessions ( bool, QString,int ) ));
+        } else {
+            sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task listsessions",
+                                            this, SLOT ( slotListSessions ( bool, QString,int ) ));
+        }
     }
 }
 
@@ -270,8 +275,13 @@ void HttpBrokerClient::selectUserSession(const QString& session)
     }
     else
     {
-        sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid \\\""+session+"\\\"",
-                                        this,SLOT ( slotSelectSession(bool,QString,int)));
+        if (config->brokerUserId.length() > 0) {
+            sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid \\\""+session+"\\\"",
+                                            this,SLOT ( slotSelectSession(bool,QString,int)));
+        } else {
+            sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task selectsession --sid \\\""+session+"\\\"",
+                                            this,SLOT ( slotSelectSession(bool,QString,int)));
+        }
     }
 
 }
@@ -299,8 +309,13 @@ void HttpBrokerClient::changePassword(QString newPass)
     }
     else
     {
-        sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task setpass --newpass "+newPass, this,
-                                        SLOT ( slotPassChanged(bool,QString,int)));
+        if (config->brokerUserId.length() > 0) {
+            sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task setpass --newpass "+newPass, this,
+                                            SLOT ( slotPassChanged(bool,QString,int)));
+        } else {
+            sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task setpass --newpass "+newPass, this,
+                                            SLOT ( slotPassChanged(bool,QString,int)));
+        }
     }
 }
 
@@ -319,8 +334,13 @@ void HttpBrokerClient::testConnection()
     }
     else
     {
-        sshConnection->executeCommand(config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task testcon",
-                                      this, SLOT ( slotSelectSession(bool,QString,int)));
+        if (config->brokerUserId.length() > 0) {
+            sshConnection->executeCommand(config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task testcon",
+                                          this, SLOT ( slotSelectSession(bool,QString,int)));
+        } else {
+            sshConnection->executeCommand(config->sshBrokerBin+" --task testcon",
+                                          this, SLOT ( slotSelectSession(bool,QString,int)));
+        }
     }
 }
 


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