diff -Naur dovecot-1.2.10/dovecot-example.conf dovecot-1.2.10-magellan/dovecot-example.conf --- dovecot-1.2.10/dovecot-example.conf 2010-01-25 00:30:41.000000000 +0100 +++ dovecot-1.2.10-magellan/dovecot-example.conf 2010-03-04 16:18:33.000000000 +0100 @@ -10,18 +10,14 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " # Default values are shown for each setting, it's not required to uncomment -# those. These are exceptions to this though: No sections (e.g. namespace {}) -# or plugin settings are added by default, they're listed only as examples. -# Paths are also just examples with the real defaults being based on configure -# options. The paths listed here are for configure --prefix=/usr -# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl ++# any of the lines. # Base directory where to store runtime data. #base_dir = /var/run/dovecot/ # Protocols we want to be serving: imap imaps pop3 pop3s # If you only want to use dovecot-auth, you can set this to "none". -#protocols = imap imaps +#protocols = imap imaps pop3 pop3s # A space separated list of IP or host addresses where to listen in for # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6 @@ -39,13 +35,13 @@ # listen = *:10100 # .. # } -#listen = * +#listen = [::] # Disable LOGIN command and all other plaintext authentications unless # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP # matches the local IP (ie. you're connecting from the same computer), the # connection is considered secure and plaintext authentication is allowed. -#disable_plaintext_auth = yes +#disable_plaintext_auth = no # Should all IMAP and POP3 processes be killed when Dovecot master process # shuts down. Setting this to "no" means that Dovecot can be upgraded without @@ -90,10 +86,11 @@ # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before # dropping root privileges, so keep the key file unreadable by anyone but -# root. Included doc/mkcert.sh can be used to easily generate self-signed -# certificate, just make sure to update the domains in dovecot-openssl.cnf +# root. +# Generate the certificate as follows: +# openssl-make-cert dovecot #ssl_cert_file = /etc/ssl/certs/dovecot.pem -#ssl_key_file = /etc/ssl/private/dovecot.pem +#ssl_key_file = /etc/ssl/cert/dovecot.pem # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. Since this file is often @@ -482,7 +479,7 @@ # locking methods as well. Some operating systems don't allow using some of # them simultaneously. #mbox_read_locks = fcntl -#mbox_write_locks = dotlock fcntl +#mbox_write_locks = fcntl # Maximum time in seconds to wait for lock (all of them) before aborting. #mbox_lock_timeout = 300 diff -Naur dovecot-1.2.10/src/master/master-settings.c dovecot-1.2.10-magellan/src/master/master-settings.c --- dovecot-1.2.10/src/master/master-settings.c 2010-01-25 00:14:17.000000000 +0100 +++ dovecot-1.2.10-magellan/src/master/master-settings.c 2010-03-04 16:28:37.000000000 +0100 @@ -178,20 +178,20 @@ MEMBER(syslog_facility) "mail", /* general */ - MEMBER(protocols) "imap imaps", - MEMBER(listen) "*", + MEMBER(protocols) "imap imaps pop3 pop3s", + MEMBER(listen) "[::]", MEMBER(ssl_listen) "", MEMBER(ssl) "yes", MEMBER(ssl_ca_file) "", MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem", - MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem", + MEMBER(ssl_key_file) SSLDIR"/certs/dovecot.pem", MEMBER(ssl_key_password) "", MEMBER(ssl_parameters_regenerate) 168, MEMBER(ssl_cipher_list) "", MEMBER(ssl_cert_username_field) "commonName", MEMBER(ssl_verify_client_cert) FALSE, - MEMBER(disable_plaintext_auth) TRUE, + MEMBER(disable_plaintext_auth) FALSE, MEMBER(verbose_ssl) FALSE, MEMBER(shutdown_clients) TRUE, MEMBER(nfs_check) TRUE, @@ -255,7 +255,7 @@ MEMBER(maildir_copy_preserve_filename) FALSE, MEMBER(maildir_very_dirty_syncs) FALSE, MEMBER(mbox_read_locks) "fcntl", - MEMBER(mbox_write_locks) "dotlock fcntl", + MEMBER(mbox_write_locks) "fcntl", MEMBER(mbox_lock_timeout) 300, MEMBER(mbox_dotlock_change_timeout) 120, MEMBER(mbox_min_index_size) 0,