---- dovecot/dovecot-example.conf.orig Tue Jul 8 15:05:39 2003
-+++ dovecot/dovecot-example.conf Tue Jul 8 15:14:56 2003
-@@ -33,8 +33,8 @@
+diff -ur dovecot-1.0.0-o/dovecot-example.conf dovecot-1.0.0/dovecot-example.conf
+--- dovecot-1.0.0-o/dovecot-example.conf 2007-03-30 05:36:18.000000000 -0600
++++ dovecot-1.0.0/dovecot-example.conf 2007-04-13 23:20:41.000000000 -0600
+@@ -91,8 +91,8 @@
# 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
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
+ssl_cert_file = /var/lib/openssl/certs/imap.pem
-+ssl_key_file = /var/lib/openssl/certs/imap.pem
++ssl_key_file = /var/lib/openssl/private/imap.pem
- # SSL parameter file. Master process generates this file for login processes.
- # It contains Diffie Hellman and RSA parameters.
-@@ -92,7 +92,7 @@
+ # If key file is password protected, give the password here. Alternatively
+ # give it when starting dovecot with -p parameter.
+@@ -138,7 +138,7 @@
+ # and don't use it anywhere else. The user must also belong to a group where
# only it has access, it's used to control access for authentication process.
- # Note that this user is NOT used to access mails.
- # http://wiki.dovecot.org/UserIds
+ # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
-#login_user = dovecot
+login_user = dovecot
# Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this.
+@@ -537,20 +537,20 @@
+
+ protocol imap {
+ # Login executable location.
+- #login_executable = /usr/libexec/dovecot/imap-login
++ #login_executable = /usr/lib/dovecot/imap-login
+
+ # IMAP executable location. Changing this allows you to execute other
+ # binaries before the imap process is executed.
+ #
+ # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
+- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
++ # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
+ # <doc/wiki/Debugging/Rawlog.txt>
+ #
+ # This would attach gdb into the imap process and write backtraces into
+ # /tmp/gdbhelper.* files:
+- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
++ # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
+ #
+- #mail_executable = /usr/libexec/dovecot/imap
++ #mail_executable = /usr/lib/dovecot/imap
+
+ # Maximum IMAP command line length in bytes. Some clients generate very long
+ # command lines with huge mailboxes, so you may need to raise this if you get
+@@ -520,7 +520,7 @@
+ # Support for dynamically loadable plugins. mail_plugins is a space separated
+ # list of plugins to load.
+ #mail_plugins =
+- #mail_plugin_dir = /usr/lib/dovecot/imap
++ #mail_plugin_dir = /usr/lib/dovecot/plugins/imap
+
+ # Send IMAP capabilities in greeting message. This makes it unnecessary for
+ # clients to request it with CAPABILITY command, so it saves one round-trip.
+@@ -563,11 +563,11 @@
+
+ protocol pop3 {
+ # Login executable location.
+- #login_executable = /usr/libexec/dovecot/pop3-login
++ #login_executable = /usr/lib/dovecot/pop3-login
+
+ # POP3 executable location. See IMAP's mail_executable above for examples
+ # how this could be changed.
+- #mail_executable = /usr/libexec/dovecot/pop3
++ #mail_executable = /usr/lib/dovecot/pop3
+
+ # Don't try to set mails non-recent or seen with POP3 sessions. This is
+ # mostly intended to reduce disk I/O. With maildir it doesn't move files
+@@ -627,7 +627,7 @@
+ # Support for dynamically loadable plugins. mail_plugins is a space separated
+ # list of plugins to load.
+ #mail_plugins =
+- #mail_plugin_dir = /usr/lib/dovecot/pop3
++ #mail_plugin_dir = /usr/lib/dovecot/plugins/pop3
+
+ # Workarounds for various client bugs:
+ # outlook-no-nuls:
+@@ -655,7 +655,7 @@
+ # Support for dynamically loadable plugins. mail_plugins is a space separated
+ # list of plugins to load.
+ #mail_plugins =
+- #mail_plugin_dir = /usr/lib/dovecot/lda
++ #mail_plugin_dir = /usr/lib/dovecot/plugins/lda
+
+ # Binary to use for sending mails.
+ #sendmail_path = /usr/lib/sendmail
+@@ -669,7 +669,7 @@
+ ##
+
+ # Executable location
+-#auth_executable = /usr/libexec/dovecot/dovecot-auth
++#auth_executable = /usr/lib/dovecot/dovecot-auth
+
+ # Set max. process size in megabytes.
+ #auth_process_size = 256