The branch, build-baikal has been updated via 1f4efc0c05a04ed91fe59d0cdf823a80cae7d003 (commit) from 9d05c077283673a2386d07e678d54a0057e37f73 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gomountdirs | 2 ++ x2goserver/bin/x2goumount-session | 13 ++++++++++--- x2goserver/share/x2gofeature.d/x2goserver.features | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3648e93..4012bda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. + - Make x2gomountdirs / x2goumount-session UNC path aware. - Add support to x2gocleansessions to suspend session via state changes in the session DB. diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index d151255..4c6d6b4 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -259,6 +259,7 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; + $p=~s/~_uncpath_//; $p=~s/~//g; mkdir("$this_mdir/$p"); $mntpath="$this_mdir/$p"; @@ -317,6 +318,7 @@ for (my $i=0;$i<@dirs;$i++) my $p=@dirs[$i]; $p=~s/\/cygdrive\///; $p=~s/\/windrive\///; + $p=~s/\/uncpath\///; $p=~s/ /_/g; $p=~s/\//_/g; $fname="$fname/$p"; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 2d10c26..095fa22 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -123,19 +123,25 @@ for ($i=0;$i<@outp;$i++) { if (@line[1] ne $only_path) { - # this is for Python X2Go, the base of Windows mounted shares starts with _windrive, not _cygdrive + # this is for Python X2Go, the base of Windows mounted shares starts with _windrive or _uncpath, not _cygdrive my $only_path_windrive=$only_path; + my $only_path_uncpath=$only_path; $only_path_windrive=~ s/_cygdrive_/_windrive_/; + $only_path_uncpath=~ s/_cygdrive_/_uncpath_/; - if (@line[1] ne $only_path_windrive) + if ((@line[1] ne $only_path_windrive) && (@line[1] ne $only_path_uncpath)) { syslog('debug', "skipping non-requested path @line[1]"); goto cont; } - else + if (@line[1] e $only_path_windrive) { $only_path = $only_path_windrive; } + if (@line[1] e $only_path_uncpath) + { + $only_path = $only_path_uncpath; + } } } my $j; @@ -178,6 +184,7 @@ break: $remote=~s/\/cygdrive\///; $remote=~s/\/windrive\///; + $remote=~s/\/uncpath\///; $remote=~s/\//_/g; $remote=~s/ /_/g; $remote=~s/\\040/_/g; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 1d23695..24fd41a 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -36,6 +36,7 @@ case "$X2GO_FEATURE" in "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;; "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; + "X2GO_MOUNT_UNCPATHS") echo "ok"; exit 0;; *) exit -1;; esac hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).