Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xrdp: fix clipboard for non-ASCII characters #54113

Merged
merged 1 commit into from Jan 22, 2019
Merged

xrdp: fix clipboard for non-ASCII characters #54113

merged 1 commit into from Jan 22, 2019

Conversation

telotortium
Copy link
Contributor

Without this line, attempting to copy and paste non-ASCII characters
will result in error messages like the following (and pasting from the
server to the client will not work):

CLIPBOARD  clipboard_send_data_response_for_text: 823 : ERROR: clipboard_send_data_response_for_text: bad string
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@telotortium
Copy link
Contributor Author

telotortium commented Jan 17, 2019 •
edited

@volth I don't know - I'm not sure how to set up the drive sharing yet.

Edit: figured it out - it seems to fix your issue too.

ghost
ghost reviewed Jan 22, 2019
View reviewed changes
nixos/modules/services/networking/xrdp.nix Outdated
@@ -26,6 +26,9 @@ let
substituteInPlace $out/sesman.ini \
--replace LogFile=xrdp-sesman.log LogFile=/dev/null \
--replace EnableSyslog=1 EnableSyslog=0

# Ensure that clipboard works for non-ASCII characters
sed -i -e '/.*SessionVariables.*/ a\'$'\n'"LANG=${config.i18n.defaultLocale}"'$\n'"LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive;" $out/sesman.ini
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you break this up? It's difficult to read.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@telotortium
xrdp: fix clipboard for non-ASCII characters
8844f09 
Without this line, attempting to copy and paste non-ASCII characters
will result in error messages like the following (and pasting from the
server to the client will not work):

```
CLIPBOARD  clipboard_send_data_response_for_text: 823 : ERROR: clipboard_send_data_response_for_text: bad string
```
@ghost
Copy link

ghost commented Jan 22, 2019

LGTM 👍

@Mic92 Mic92 merged commit 6ad1271 into NixOS:master Jan 22, 2019
@Mic92
Copy link
Member

Mic92 commented Jan 22, 2019

Is this applicable for a backport?

@Mic92
Copy link
Member

Mic92 commented Jan 23, 2019

This is more a question, if someone tested or tried a backport, because I cannot test anything.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@telotortium @Mic92 @GrahamcOfBorg