[X2Go-Commits] [x2gobroker] 01/01: x2gobroker-authservice: Make sure socket file directory is created before trying to create the socket file itself.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit a93692da1198040d6095d9c91c434cb69e3bdcbd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 29 14:09:16 2014 +0100

    x2gobroker-authservice: Make sure socket file directory is created before trying to create the socket file itself.
---
 debian/changelog            |    2 ++
 sbin/x2gobroker-authservice |    9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d1d57d8..e4958bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -173,6 +173,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       'check-credentials'.
     - Configure broker / authservice environment via .service files.
     - Load defaults.conf via authservices and for logger configuration, as well.
+    - x2gobroker-authservice: Make sure socket file directory is created
+      before trying to create the socket file itself.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice
index af8cb6e..31e46be 100755
--- a/sbin/x2gobroker-authservice
+++ b/sbin/x2gobroker-authservice
@@ -264,6 +264,15 @@ if __name__ == '__main__':
                 daemon_logdir += '/'
 
     socket_file = cmdline_args.socket_file
+
+    if os.path.exists(socket_file):
+        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)
+
     AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions)
     atexit.register(cleanup_on_exit)
     try:

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