summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-07-27 14:17:49 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-07-27 14:17:49 +0200
commit063eb95d66064f8092a5ad918842e33cba9b8f36 (patch)
treeef38a3ff5e8a4dabf3ca97aa45615179dcdfa795
parent50b0c2a384bd2da1b210c156c8e6e138d8948b9c (diff)
downloadpykolab-063eb95d66064f8092a5ad918842e33cba9b8f36.tar.gz
Ensure the correct format for the modifytimestamp_format is included in the default configuration, and it's obtained as a raw value
-rw-r--r--conf/kolab.conf4
-rw-r--r--pykolab/auth/ldap/cache.py10
2 files changed, 9 insertions, 5 deletions
diff --git a/conf/kolab.conf b/conf/kolab.conf
index 2f8ea2b..d9a6a5a 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -234,6 +234,10 @@ domain_rootdn_attribute = inetdomainbasedn
; The attribute that holds the quota.
quota_attribute = mailquota
+
+; The format of the modifytimestamp attribute values
+modifytimestamp_format = %Y%m%d%H%M%SZ
+
; A unique attribute that can be used to identify the entry beyond renames and
; moves. Note that 'nsuniqueid' is specific to all Netscape-based directory
; services.
diff --git a/pykolab/auth/ldap/cache.py b/pykolab/auth/ldap/cache.py
index c21d9a6..eaf2ffa 100644
--- a/pykolab/auth/ldap/cache.py
+++ b/pykolab/auth/ldap/cache.py
@@ -63,7 +63,7 @@ class Entry(object):
self.uniqueid = uniqueid
self.result_attribute = result_attr
- modifytimestamp_format = conf.get('ldap', 'modifytimestamp_format')
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
if modifytimestamp_format == None:
modifytimestamp_format = "%Y%m%d%H%M%SZ"
@@ -95,7 +95,7 @@ mapper(Entry, entry_table)
##
def delete_entry(domain, entry):
- result_attribute = conf.get('cyrus-sasl', 'result_attribute')
+ result_attribute = conf.get_raw('cyrus-sasl', 'result_attribute')
db = init_db(domain)
_entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
@@ -105,7 +105,7 @@ def delete_entry(domain, entry):
db.commit()
def get_entry(domain, entry, update=True):
- result_attribute = conf.get('cyrus-sasl', 'result_attribute')
+ result_attribute = conf.get_raw('cyrus-sasl', 'result_attribute')
_entry = None
@@ -139,7 +139,7 @@ def get_entry(domain, entry, update=True):
db.commit()
_entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
else:
- modifytimestamp_format = conf.get('ldap', 'modifytimestamp_format')
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
if modifytimestamp_format == None:
modifytimestamp_format = "%Y%m%d%H%M%SZ"
@@ -188,7 +188,7 @@ def last_modify_timestamp(domain):
db = init_db(domain)
last_change = db.query(Entry).order_by(desc(Entry.last_change)).first()
- modifytimestamp_format = conf.get('ldap', 'modifytimestamp_format')
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
if modifytimestamp_format == None:
modifytimestamp_format = "%Y%m%d%H%M%SZ"