x2goclient.git - master (branch) updated: 3.99.2.2-36-g26d4c8a - x2go-commits

13 Sep 2012

The branch, master has been updated
       via  26d4c8a85d433bf31b42473b84032816aa40dc6e (commit)
      from  bace365a71c05d924288e2f0b8d0ff1af2245a19 (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 26d4c8a85d433bf31b42473b84032816aa40dc6e
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Sep 13 17:03:05 2012 +0200

    Allow pass-through of username and password for X2Go-proxied RDP sessions. The strings X2GO_USER and X2GO_PASSWORD in rdpoptions will be replaced by username+password enter into X2Go Clients login dialog.

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

Summary of changes:
 debian/changelog |    4 ++++
 onmainwindow.cpp |    2 ++
 sshprocess.cpp   |    3 ++-
 3 files changed, 8 insertions(+), 1 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index f5dc500..40ce27e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
     - Update German translation.
     - Run X2Go-proxied RDP session with fullscreen mode as sessions
       of X2Go session type "D". Closes upstream issue #22.
+    - Allow pass-through of username and password for X2Go-proxied RDP
+      sessions. The strings X2GO_USER and X2GO_PASSWORD in rdpoptions
+      will be replaced by username+password enter into X2Go Clients
+      login dialog.
   * Add rdesktop and xfreerdp to Recommends.
 
   [ Daniel Lindgren ]
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index f4fdfa3..9938e35 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5611,6 +5611,8 @@ void ONMainWindow::runCommand()
             rdpOpts=st->setting()->value (
                         sid+"/rdpoptions",
                         ( QVariant ) "" ).toString();
+            rdpOpts.replace("X2GO_USER", user);
+            rdpOpts.replace("X2GO_PASSWORD", passwd);
             rdpServer=st->setting()->value (
                           sid+"/rdpserver",
                           ( QVariant ) "" ).toString();
diff --git a/sshprocess.cpp b/sshprocess.cpp
index a0734ba..5ee5a72 100644
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -132,7 +132,8 @@ void SshProcess::startNormal(const QString& cmd)
 {
     QString shcmd = "sh -c \""+cmd+"\"";
 // #ifdef DEBUG
-    x2goDebug<<"executing remote command: "<<shcmd<<endl;
+// ONLY UNCOMMENT FOR TESTING, MIGHT REVEAL PASSWORD WHEN command=RDP
+//    x2goDebug<<"executing remote command: "<<shcmd<<endl;
 // #endif
     masterCon->addChannelConnection(this, shcmd);
     connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray)));


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

    