[debian-edu-commits] debian-edu/ 21/22: Fixes.

[Dominik George]

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

natureshadow-guest pushed a commit to branch fix-repo
in repository xrdp.

commit 4d1ff1abfa46772f6866ed68e696d72b808b001c
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 27 23:14:28 2016 +0200

    Fixes.
---
 debian/control   |  4 ++--
 debian/socksetup | 30 ++++++------------------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index a4f30a3..0ffa395 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Build-Depends:
  systemd [linux-any],
  xserver-xorg-dev,
 Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xrdp.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/xrdp.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-edu/pkg-team/xrdp.git
+Vcs-Git: https://anonscm.debian.org/git/debian-edu/pkg-team/xrdp.git
 Homepage: http://xrdp.sourceforge.net
 
 Package: xrdp
diff --git a/debian/socksetup b/debian/socksetup
index 9ceef98..313e72f 100644
--- a/debian/socksetup
+++ b/debian/socksetup
@@ -12,30 +12,12 @@ case $(id -u) in
 	;;
 esac
 
-if ! test -d /var/run/xrdp; then
-	mkdir /var/run/xrdp || exit 1
-	chown root:xrdp /var/run/xrdp || exit 1
-	chmod 2775 /var/run/xrdp || exit 1
-fi
-case $(stat -c '%a,%u,%G,%F' /var/run/xrdp) in
-(2775,0,xrdp,directory) ;;
-(*)
-	echo >&2 "E: /var/run/xrdp has wrong permissions"
-	exit 1
-	;;
-esac
+mkdir -p /var/run/xrdp || exit 1
+chown root:xrdp /var/run/xrdp || exit 1
+chmod 2775 /var/run/xrdp || exit 1
 
-if ! test -d /var/run/xrdp/sockdir; then
-	mkdir /var/run/xrdp/sockdir || exit 1
-	chown root:xrdp /var/run/xrdp/sockdir || exit 1
-	chmod 3777 /var/run/xrdp/sockdir || exit 1
-fi
-case $(stat -c '%a,%u,%G,%F' /var/run/xrdp/sockdir) in
-(3777,0,xrdp,directory) ;;
-(*)
-	echo >&2 "E: /var/run/xrdp/sockdir has wrong permissions"
-	exit 1
-	;;
-esac
+mkdir -p /var/run/xrdp/sockdir || exit 1
+chown root:xrdp /var/run/xrdp/sockdir || exit 1
+chmod 3777 /var/run/xrdp/sockdir || exit 1
 
 :

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