[X2Go-Commits] [x2goserver] 01/01: x2goserver/bin/x2goresume-session: fix clipboard handling.

[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 x2goserver.

commit 8bed0f4030fcf0f1c5033278d9940a7b8caf299e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Aug 4 17:20:46 2021 +0200

    x2goserver/bin/x2goresume-session: fix clipboard handling.
    
    The "${clipboard}" variable already includes the "clipboard" key.
---
 debian/changelog                  | 2 ++
 x2goserver/bin/x2goresume-session | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8c684b0f..8cd85461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -414,6 +414,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       and interpret 'filedes' as an argument to the program instead of as a
       file descriptor to be used for the redirection, even though 'filedes'
       might be something like '2'.
+    - x2goserver/bin/x2goresume-session: fix clipboard handling. The
+      "${clipboard}" variable already includes the "clipboard" key.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
     + Pull in base64 as a run-time dependency. We'll need it in scripts.
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 8a761780..3f00a24e 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -301,7 +301,7 @@ new_agent_options_base64="$(x2gooptionsstring -t -c -b -- "${agent_options_base6
 			    "$(printf 'resize=%s' "${resize_val}" | base64 -w '0')" \
 			    "$(printf 'listen=%s' "${gr_port}" | base64 -w '0')" \
 			    "$(printf 'fullscreen=%s' "${fullscreen_val}" | base64 -w '0')" \
-			    "$(printf 'clipboard=%s' "${clipboard}" | base64 -w '0')" \
+			    "$(printf '%s' "${clipboard}" | base64 -w '0')" \
 			    2>'/dev/null')"
 
 if [ '1' -eq "${has_xinerama}" ]; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git