Branch 'dev/boddie-new/combined' - saslauthd/__init__.py

[Paul Boddie]

 saslauthd/__init__.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b13b24d5a917715a69c22000fc383648f9f9eb3f
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Wed Sep 10 17:53:56 2014 +0200

    Access the socketfile setting via the conf object.

diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py
index 6590747..1ae09dd 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(socketfile)
+            os.remove(conf.socketfile)
         except:
             # TODO: Do the "could not remove, could not start" dance
             pass
 
-        s.bind(socketfile)
-        os.chmod(socketfile, 0777)
+        s.bind(conf.socketfile)
+        os.chmod(conf.socketfile, 0777)
 
         s.listen(5)
 
@@ -271,7 +271,7 @@ class SASLAuthDaemon(object):
 
     def _ensure_socket_dir(self):
         utils.ensure_directory(
-                os.path.dirname(socketfile),
+                os.path.dirname(conf.socketfile),
                 conf.process_username,
                 conf.process_groupname
             )