[X2Go-Commits] [x2gobroker] 01/01: fix chown/chmod on RuntimeDir

git-admin at x2go.org git-admin at x2go.org
Wed Oct 29 15:37:32 CET 2014


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 39f12ac20204217ec9d8268106feba71d3edf51b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 29 15:37:27 2014 +0100

    fix chown/chmod on RuntimeDir
---
 sbin/x2gobroker-authservice |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice
index 31e46be..52b2367 100755
--- a/sbin/x2gobroker-authservice
+++ b/sbin/x2gobroker-authservice
@@ -269,9 +269,10 @@ if __name__ == '__main__':
         os.remove(socket_file)
 
     if not os.path.exists(os.path.dirname(socket_file)):
-        os.makedirs(os.path.dirname(os.path.dirname(socket_file)))
-        os.mkdir(os.path.dirname(socket_file), 0770)
-        os.chown(os.path.dirname(socket_file), cmdline_args.owner, cmdline_args.group)
+        os.makedirs(os.path.dirname(socket_file))
+
+    os.chown(os.path.dirname(socket_file), getpwnam(cmdline_args.owner).pw_uid, getpwnam(cmdline_args.group).pw_gid)
+    os.chmod(os.path.dirname(socket_file), int(cmdline_args.permissions, 8))
 
     AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions)
     atexit.register(cleanup_on_exit)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list