From 8c94c6b3880f5e2b495d401de576ab489fd2dc2d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 10 Nov 2018 11:50:08 +0100 Subject: freerdp2-session.in: Send xfreerdp options being used to syslog. --- freerdp2-session.in | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/freerdp2-session.in b/freerdp2-session.in index b08d98c..571330f 100755 --- a/freerdp2-session.in +++ b/freerdp2-session.in @@ -20,7 +20,8 @@ # Author lightdm-remote-session-freerdp (where we forked from): Ted Gould # -FREERDP2_OPTIONS = "" +NULL= +FREERDP2_OPTIONS="" if [ -f /etc/default/lightdm-remote-session-freerdp2 ]; then . /etc/default/lightdm-remote-session-freerdp2 @@ -40,18 +41,22 @@ if [ -e "$socket" ]; then # give the RDP server a little bit of time to recover from libpam-freerdp2's freerdp2-auth-check test connect. sleep 1 + FREERDP2_OPTIONS="/f \ + /v:"${AUTH_INFO_HOST}" \ + /u:"${AUTH_INFO_USER}" \ + /d:"${AUTH_INFO_DOMAIN}" \ + /from-stdin \ + -toggle-fullscreen \ + ${FREERDP2_OPTIONS} \ + ${NULL}" + + logger -t $(basname $0) "xfreerdp called with options: ${FREERDP_OPTIONS}." + + # FIXME: get audio working... add /sound:sys:pulse to xfreerdp cmdline args... - echo "$AUTH_INFO_PASSWORD" | /usr/bin/xfreerdp /f \ - /v:"${AUTH_INFO_HOST}" \ - /u:"${AUTH_INFO_USER}" \ - /d:"${AUTH_INFO_DOMAIN}" \ - /from-stdin \ - -toggle-fullscreen \ - ${FREERDP2_OPTIONS} \ - 2>&1 \ - \ + echo "$AUTH_INFO_PASSWORD" | /usr/bin/xfreerdp ${FREERDP_OPTIONS} 2>&1 \ | logger -t lightdm-remote-session-freerdp2 -- \ - & + ${NULL} & unset AUTH_INFO_PASSWORD -- cgit v1.2.3