[X2Go-Commits] [x2goclient] 01/01: Windows: Fix audio (PulseAudio) when Kerberos 5 (GSSAPI) authentication is used (Fixes: #869)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 84d4bd861f7b9a92efdf812367d4e2f3d34fe02f
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Tue May 12 08:01:38 2015 -0400

    Windows: Fix audio (PulseAudio) when Kerberos 5 (GSSAPI) authentication is used (Fixes: #869)
---
 debian/changelog   |    2 ++
 src/sshprocess.cpp |   21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5a1950..dc02f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       sharing when Kerberos 5 (GSSAPI) auth is used, and the
       server-side home dir is at a path other than /home/$USER
       (Fixes: #868)
+    - Windows: Fix audio (PulseAudio) when Kerberos 5
+      (GSSAPI) authentication is used (Fixes: #869)
     - Windows: Include debug build in the regular installer.
       It is an optional component during the install. It is not
       installed by default.
diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp
index 18b3106..dc27bd2 100644
--- a/src/sshprocess.cpp
+++ b/src/sshprocess.cpp
@@ -266,17 +266,32 @@ void SshProcess::start_cp(QString src, QString dst)
     {
         proc=new QProcess(this);
 #ifdef Q_OS_WIN
-//pscp doesn't acccept paths like "~user/foo.txt" when in SFTP mode (default)
-//However, pscp does accept paths like "~/foo.txt"
-//You simply have to leave the "~/" out.
+//pscp doesn't acccept paths like the following when in SFTP mode (default)
+//~user/foo.txt
+//~/foo.txt
+//${HOME}/foo.txt
+//$HOME/foo.txt
+//
+//However, pscp does let you specify a path relative to the user's home dir.
+//You simply specify the relative path without a / at the beginning.
+//For example:
+//foo.txt
 //
 //This workaround assumes that files will never be uploaded to a home dir
 //other than the user's.
+
         dst.remove("~"+masterCon->getUser()+"/");
         dst.remove("~"+masterCon->getUser()    );
+
         dst.remove("~/");
         dst.remove("~" );
 
+        dst.remove("${HOME}/");
+        dst.remove("${HOME}");
+
+        dst.remove("$HOME/");
+        dst.remove("$HOME");
+
         QString sshString="pscp -batch -P "+
 #else
         QString sshString="scp -o GSSApiAuthentication=yes -o PasswordAuthentication=no -o PubkeyAuthentication=no -P "+

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git