summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Homem <gustavo@angulosolido.pt>2013-03-20 17:19:40 +0000
committerGustavo Homem <gustavo@angulosolido.pt>2013-03-20 17:19:40 +0000
commit49301fac005acab080ccc2d5d884d1d5f87b3c94 (patch)
treecad3d6267f5d1dc33fe6d969636dc0d8150f846f
parent4d9cd08cfc764655ded8b79c4edd760fd5add6c1 (diff)
downloadxrdp-proprietary-49301fac005acab080ccc2d5d884d1d5f87b3c94.tar.gz
xrdp-proprietary-49301fac005acab080ccc2d5d884d1d5f87b3c94.zip
further integration fixes
-rw-r--r--debian/postinst11
-rwxr-xr-xinstfiles/init.d/xrdp4
2 files changed, 10 insertions, 5 deletions
diff --git a/debian/postinst b/debian/postinst
index 37e4931d..de913aed 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,16 +6,19 @@ fi
XRDP="xrdp"
-CHOWN="/bin/chown"
ADDUSER="/usr/sbin/adduser"
+XRDPLOG="/var/log/xrdp-sesman.log"
SESMANLOG="/var/log/xrdp-sesman.log"
+RSAKEYS="/etc/xrdp/rsakeys.ini"
[ -d /var/run/xrdp ] || mkdir -p /var/run/xrdp
$ADDUSER --system --disabled-password --disabled-login --home /var/run/xrdp \
--no-create-home --quiet --group $XRDP
-touch $SESMANLOG
-$CHOWN $XRDP:$XRDP $SESMANLOG
-
+touch $SESMANLOG $XRDPLOG
+chown $XRDP:$XRDP $SESMANLOG
+chown $XRDP:$XRDP $XRDPLOG
+chgrp $XRDP $RSAKEYS
+chmod g+r $RSAKEYS
#DEBHELPER#
diff --git a/instfiles/init.d/xrdp b/instfiles/init.d/xrdp
index 33eeb861..0c71f35f 100755
--- a/instfiles/init.d/xrdp
+++ b/instfiles/init.d/xrdp
@@ -14,7 +14,9 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/xrdp
PIDDIR=/var/run/xrdp
-USERID=xrdp
+#USERID=xrdp
+# for now X11rdp sessions require root - should be fixed in the future
+USERID=root
RSAKEYS=/etc/xrdp/rsakeys.ini
NAME=xrdp
DESC=xrdp