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