Kolab Groupware OBS

cyrus-imapd.spec Changed

cyrus-imapd-2.5.tar.gz/cunit/backend.testc Changed

@@ -1246,16 +1246,16 @@
     old_config_dir = (char *)config_dir;
     config_dir = xstrdup(cwd);
 
-    old_tls_ca_file = (char *)imapopts[IMAPOPT_TLS_CA_FILE].val.s;
-    imapopts[IMAPOPT_TLS_CA_FILE].val.s =
+    old_tls_ca_file = (char *)imapopts[IMAPOPT_TLS_SERVER_CA_FILE].val.s;
+    imapopts[IMAPOPT_TLS_SERVER_CA_FILE].val.s =
 	    strconcat(cwd, "/cacert.pem", (char *)NULL);
 
-    old_tls_cert_file = (char *)imapopts[IMAPOPT_TLS_CERT_FILE].val.s;
-    imapopts[IMAPOPT_TLS_CERT_FILE].val.s =
+    old_tls_cert_file = (char *)imapopts[IMAPOPT_TLS_SERVER_CERT].val.s;
+    imapopts[IMAPOPT_TLS_SERVER_CERT].val.s =
 	    strconcat(cwd, "/cert.pem", (char *)NULL);
 
-    old_tls_key_file = (char *)imapopts[IMAPOPT_TLS_KEY_FILE].val.s;
-    imapopts[IMAPOPT_TLS_KEY_FILE].val.s =
+    old_tls_key_file = (char *)imapopts[IMAPOPT_TLS_SERVER_KEY].val.s;
+    imapopts[IMAPOPT_TLS_SERVER_KEY].val.s =
 	    strconcat(cwd, "/key.pem", (char *)NULL);
 
     /* disable SSL session caching */
@@ -1322,14 +1322,14 @@
 
     imapopts[IMAPOPT_TLS_SESSION_TIMEOUT].val.i = old_session_timeout;
 
-    free((char *)imapopts[IMAPOPT_TLS_CA_FILE].val.s);
-    imapopts[IMAPOPT_TLS_CA_FILE].val.s = old_tls_ca_file;
+    free((char *)imapopts[IMAPOPT_TLS_SERVER_CA_FILE].val.s);
+    imapopts[IMAPOPT_TLS_SERVER_CA_FILE].val.s = old_tls_ca_file;
 
-    free((char *)imapopts[IMAPOPT_TLS_CERT_FILE].val.s);
-    imapopts[IMAPOPT_TLS_CERT_FILE].val.s = old_tls_cert_file;
+    free((char *)imapopts[IMAPOPT_TLS_SERVER_CERT].val.s);
+    imapopts[IMAPOPT_TLS_SERVER_CERT].val.s = old_tls_cert_file;
 
-    free((char *)imapopts[IMAPOPT_TLS_KEY_FILE].val.s);
-    imapopts[IMAPOPT_TLS_KEY_FILE].val.s = old_tls_key_file;
+    free((char *)imapopts[IMAPOPT_TLS_SERVER_KEY].val.s);
+    imapopts[IMAPOPT_TLS_SERVER_KEY].val.s = old_tls_key_file;
 
     return 0;
 }

cyrus-imapd-2.5.tar.gz/lib/imapoptions Changed

@@ -389,7 +389,7 @@
    mailboxes hierarchy.  The hierarchy delimiter will be automatically
    appended. */
 
-{ "delete_mode", "immediate", ENUM("immediate", "delayed") }
+{ "delete_mode", "delayed", ENUM("immediate", "delayed") }
 /*  The manner in which mailboxes are deleted. "immediate" mode is the
     default behavior in which mailboxes are removed immediately.  In
     "delayed" mode, mailboxes are renamed to a special hiearchy defined
@@ -462,7 +462,7 @@
 /* Notifyd(8) method to use for "EVENT" notifications which are based on
    the RFC 5423.  If not set, "EVENT" notifications are disabled. */
 
-{ "expunge_mode", "default", ENUM("default", "immediate", "delayed") }
+{ "expunge_mode", "delayed", ENUM("default", "immediate", "delayed") }
 /* The mode in which messages (and their corresponding cache entries)
    are expunged.  "default" mode is the default behavior in which the
    message files are purged at the time of the EXPUNGE, but index
@@ -1698,10 +1698,11 @@
    with a backend (such as LDAP) that can make getgrent() calls very
    slow) */
 
-{ "unixhierarchysep", 0, SWITCH }
+{ "unixhierarchysep", 1, SWITCH }
 /* Use the UNIX separator character '/' for delimiting levels of
-   mailbox hierarchy.  The default is to use the netnews separator
-   character '.'. */
+   mailbox hierarchy.  Turn off to use the netnews separator
+   character '.'. Note that with the newnews separator, no dots may
+   occur in mailbox names. */
 
 { "virtdomains", "off", ENUM("off", "userid", "on") }
 /* Enable virtual domain support.  If enabled, the user's domain will

cyrus-imapd-2.5.tar.gz/master/conf/cmu-backend.conf Changed

cyrus-imapd-2.5.tar.gz/master/conf/normal.conf Changed

cyrus-imapd-2.5.tar.gz/master/conf/prefork.conf Changed

cyrus-imapd-2.5.tar.gz/master/conf/small.conf Changed

Changes of Revision 104