Hi, can 8a23d03fa441f76026e923ac86533d6f85b11064 be backported to 2.4? If so strconcat must be backported as well, that is commit 3f1cc0a7f1e7afb0e52a99d27982a7d94d9bff85.
We are running with both patches applied against 2.4.8alpha1, and it works as expected. 8a23d03fa441f76026e923ac86533d6f85b11064 introduced some typos in lib/imapoptions, which is fixed in attached patch. #3185 can now be closed. -- Øyvind Kolbu Postmaster University of Oslo
From 99659c480d24bcb1f6d9f469aa72868d7992960d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8yvind=20Kolbu?= <oyvind.ko...@usit.uio.no>
Date: Wed, 6 Apr 2011 16:01:01 +0200
Subject: [PATCH 9/9] Correct some comments in lib/imapoptions.
---
lib/imapoptions | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/imapoptions b/lib/imapoptions
index 4d11dcd..8d890e2 100644
--- a/lib/imapoptions
+++ b/lib/imapoptions
@@ -169,7 +169,7 @@ are listed with ``<none>''.
/* The cyrusdb backend to use for mailbox annotations. */
{ "annotation_db_path", NULL, STRING }
-/* The absolute path to the ptscache db file. If not specified,
+/* The absolute path to the annotations db file. If not specified,
will be confdir/annotations.db */
{ "anyoneuseracl", 1, SWITCH }
@@ -305,8 +305,8 @@ Blank lines and lines beginning with ``#'' are ignored.
and sieve. */
{ "duplicate_db_path", NULL, STRING }
-/* The absolute path to the ptscache db file. If not specified,
- will be confdir/duplicate.db */
+/* The absolute path to the duplicate db file. If not specified,
+ will be confdir/deliver.db */
{ "duplicatesuppression", 1, SWITCH }
/* If enabled, lmtpd will suppress delivery of a message to a mailbox if
@@ -1267,7 +1267,7 @@ product version in the capabilities */
{ "tlscache_db_path", NULL, STRING }
/* The absolute path to the tlscache db file. If not specified,
- will be confdir/tlscache.db */
+ will be confdir/tls_sessions.db */
{ "tls_cert_file", NULL, STRING }
/* File containing the certificate presented for server authentication
@@ -1297,7 +1297,7 @@ product version in the capabilities */
{ "userdeny_db_path", NULL, STRING }
/* The absolute path to the userdeny db file. If not specified,
- will be confdir/userdeny.db */
+ will be confdir/user_deny.db */
{ "user_folder_limit", 0, INT }
/* Limit the number of folders a user can create in their INBOX.
--
1.7.1
pgpiDE1U11ivC.pgp
Description: PGP signature
