summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAeneas Jai├čle <aj@ajaissle.de>2014-08-24 14:04:57 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-08-24 14:15:46 +0200
commitafdbc23d4b157a8e5449531896e0e0f01ce6fc4b (patch)
treede87f728897c277cdd463254e4b9d85cf779cb27
parent3aa398fd8c4836868d5223638d3318bd64c337b6 (diff)
downloadpykolab-afdbc23d4b157a8e5449531896e0e0f01ce6fc4b.tar.gz
Actually use the socket configured
-rw-r--r--saslauthd/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py
index b7f81d5..6590747 100644
--- a/saslauthd/__init__.py
+++ b/saslauthd/__init__.py
@@ -170,13 +170,13 @@ class SASLAuthDaemon(object):
# TODO: The saslauthd socket path could be a setting.
try:
- os.remove('/var/run/saslauthd/mux')
+ os.remove(socketfile)
except:
# TODO: Do the "could not remove, could not start" dance
pass
- s.bind('/var/run/saslauthd/mux')
- os.chmod('/var/run/saslauthd/mux', 0777)
+ s.bind(socketfile)
+ os.chmod(socketfile, 0777)
s.listen(5)
@@ -271,7 +271,7 @@ class SASLAuthDaemon(object):
def _ensure_socket_dir(self):
utils.ensure_directory(
- '/var/run/saslauthd/',
+ os.path.dirname(socketfile),
conf.process_username,
conf.process_groupname
)