9e566a4
diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions
9e566a4
--- cyrus-imapd-2.3.1.orig/lib/imapoptions	2005-12-13 20:36:11.000000000 +0100
9e566a4
+++ cyrus-imapd-2.3.1/lib/imapoptions	2006-01-13 10:17:26.000000000 +0100
9e566a4
@@ -198,9 +198,12 @@
9e566a4
    grant the user the ability to delete a mailbox.  If a user has this
9e566a4
    right, they will automatically be given the new 'x' right. */
9e566a4
 
9e566a4
-{ "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
9e566a4
+{ "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
9e566a4
 /* The cyrusdb backend to use for the duplicate delivery suppression
9e566a4
-   and sieve. */
9e566a4
+   and sieve.
9e566a4
+.PP
9e566a4
+   Note: This Invoca RPM build uses \fIskiplist\fR by default instead of
9e566a4
+   \fIberkeley-nosync\fR for \fBduplicate_db\fR. */
9e566a4
 
9e566a4
 { "duplicatesuppression", 1, SWITCH }
9e566a4
 /* If enabled, lmtpd will suppress delivery of a message to a mailbox if
9e566a4
@@ -220,12 +223,15 @@
9e566a4
    result in greater responsiveness for the client, especially when
9e566a4
    expunging a large number of messages. */
9e566a4
 
9e566a4
-{ "flushseenstate", 0, SWITCH }
9e566a4
+{ "flushseenstate", 1, SWITCH }
9e566a4
 /* If enabled, changes to the seen state will be flushed to disk
9e566a4
    immediately, otherwise changes will be cached and flushed when the
9e566a4
    mailbox is closed.  This option may be used to fix the problem of
9e566a4
    previously read messages being marked as unread in Microsoft
9e566a4
-   Outlook, at the expense of a loss of performance/scalability. */
9e566a4
+   Outlook, at the expense of a loss of performance/scalability.
9e566a4
+.PP
9e566a4
+   Note: This Invoca RPM build uses \fI1\fR by default instead of
9e566a4
+   \fI0\fR for \fBflushseenstate\fR. */
9e566a4
 
9e566a4
 { "foolstupidclients", 0, SWITCH }
9e566a4
 /* If enabled, only list the personal namespace when a LIST "*" is performed.
9e566a4
@@ -735,8 +741,11 @@
9e566a4
 /* Unix domain socket that ptloader listens on.
9e566a4
    (defaults to configdir/ptclient/ptsock) */
9e566a4
 
9e566a4
-{ "ptscache_db", "berkeley", STRINGLIST("berkeley", "skiplist") }
9e566a4
-/* The cyrusdb backend to use for the pts cache. */
9e566a4
+{ "ptscache_db", "skiplist", STRINGLIST("berkeley", "skiplist") }
9e566a4
+/* The cyrusdb backend to use for the pts cache.
9e566a4
+.PP
9e566a4
+   Note: This Invoca RPM build uses \fIskiplist\fR by default instead of
9e566a4
+   \fIberkeley\fR for \fBptscache_db\fR. */
9e566a4
 
9e566a4
 { "ptscache_timeout", 10800, INT }
9e566a4
 /* The timeout (in seconds) for the PTS cache database when using the
9e566a4
@@ -813,9 +822,12 @@
9e566a4
 { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist") }
9e566a4
 /* The cyrusdb backend to use for the seen state. */
9e566a4
 
9e566a4
-{ "sendmail", "/usr/lib/sendmail", STRING }
9e566a4
+{ "sendmail", "/usr/sbin/sendmail", STRING }
9e566a4
 /* The pathname of the sendmail executable.  Sieve invokes sendmail
9e566a4
-   for sending rejections, redirects and vacation responses. */
9e566a4
+   for sending rejections, redirects and vacation responses.
9e566a4
+.PP
9e566a4
+   Note: This Invoca RPM build uses \fI/usr/sbin/sendmail\fR by default
9e566a4
+   instead of \fI/usr/lib/sendmail\fR for \fBsendmail\fR. */
9e566a4
 
9e566a4
 { "servername", NULL, STRING }
9e566a4
 /* This is the hostname visible in the greeting messages of the POP,
9e566a4
@@ -842,9 +854,12 @@
9e566a4
 /* Maximum number of sieve scripts any user may have, enforced at
9e566a4
    submission by timsieved(8). */
9e566a4
    
9e566a4
-{ "sievedir", "/usr/sieve", STRING }
9e566a4
+{ "sievedir", "/var/lib/imap/sieve", STRING }
9e566a4
 /* If sieveusehomedir is false, this directory is searched for Sieve
9e566a4
-   scripts. */
9e566a4
+   scripts.
9e566a4
+.PP
9e566a4
+   Note: This Invoca RPM build uses \fI/var/lib/imap/sieve\fR by default
9e566a4
+   instead of \fI/usr/sieve\fR for \fBsievedir\fR. */
9e566a4
 
9e566a4
 { "sievenotifier", NULL, STRING }
9e566a4
 /* Notifyd(8) method to use for "SIEVE" notifications.  If not set, "SIEVE"
9e566a4
@@ -934,8 +949,11 @@
9e566a4
    have filenames with the hashed value of the certificate (see
9e566a4
    openssl(XXX)). */
9e566a4
 
9e566a4
-{ "tlscache_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
9e566a4
-/* The cyrusdb backend to use for the TLS cache. */
9e566a4
+{ "tlscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
9e566a4
+/* The cyrusdb backend to use for the TLS cache.
9e566a4
+.PP
9e566a4
+   Note: This Invoca RPM build uses \fIskiplist\fR by default instead of
9e566a4
+   \fIberkeley-nosync\fR for \fBtlscache_db\fR. */
9e566a4
 
9e566a4
 { "tls_cert_file", NULL, STRING }
9e566a4
 /* File containing the certificate presented for server authentication