2 commits - saslauthd/__init__.py share/templates

[Jeroen van Meeuwen]

 saslauthd/__init__.py          |    8 ++++----
 share/templates/imapd.conf.tpl |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5283fc07db830012d6128487404d108b19be6dae
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 3 17:53:33 2014 +0200

    Add date and index sieve extensions

diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl
index 874e55a..a43aad9 100644
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -32,7 +32,7 @@ ldap_time_limit: 10
 unixhierarchysep: 1
 virtdomains: userid
 annotation_definitions: /etc/imapd.annotations.conf
-sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy
+sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
 allowallsubscribe: 0
 allowusermoves: 1
 altnamespace: 1


commit a9f7ca7f249362e96abcb68a21a0ef85a2d9f7d7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Sep 12 01:10:55 2014 +0200

    Actually fix the socket file

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
             )