[pkg-remote-commits] [xrdp] 02/19: Source /etc/profile in startwm.

[Thorsten Glaser]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch master
in repository xrdp.

commit db0a9c7371d0d9606162ae2c66281046750a0465
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Dec 15 11:31:55 2017 +0100

    Source /etc/profile in startwm.
    
    (cherry picked from commit c7c18e4d60afb14ffba68b4565c7ef4295b4e7bb)
---
 debian/changelog  | 4 +++-
 debian/startwm.sh | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f875a77..c83cb5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 xrdp (0.9.4-4) unstable; urgency=high
 
   * Fix (possibly exploitable) high CPU load in ssl_tls_accept.
+  * Source /etc/profile in startwm. (Closes: #882246)
+    + Thanks to Wolfgang Schweer!
 
- -- Dominik George <nik at naturalnet.de>  Fri, 15 Dec 2017 11:24:55 +0100
+ -- Dominik George <nik at naturalnet.de>  Fri, 15 Dec 2017 11:31:14 +0100
 
 xrdp (0.9.4-3) unstable; urgency=high
 
diff --git a/debian/startwm.sh b/debian/startwm.sh
index 83476fc..9341fae 100755
--- a/debian/startwm.sh
+++ b/debian/startwm.sh
@@ -2,6 +2,10 @@
 # xrdp X session start script (c) 2015 mirabilos
 # published under The MirOS Licence
 
+if test -r /etc/profile; then
+	. /etc/profile
+fi
+
 if test -r /etc/default/locale; then
 	. /etc/default/locale
 	test -z "${LANG+x}" || export LANG

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git