--- dovecot-1.0.rc7/dovecot-example.conf.orig	2006-09-22 22:00:07 -0400

+++ dovecot-1.0.rc7/dovecot-example.conf	2006-09-28 12:26:28 -0400

@@ -10,14 +10,14 @@

 # any of the lines. Exception to this are paths, they're 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

+# --with-ssldir=/var/lib/ssl --libexecdir=/usr/lib

 # 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

 # IP or host address where to listen in for connections. It's not currently

 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.

@@ -87,8 +87,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/ssl/certs/dovecot.pem

+ssl_key_file = /var/lib/ssl/private/dovecot.pem

 # If key file is password protected, give the password here. Alternatively

 # give it when starting dovecot with -p parameter.

@@ -235,7 +235,7 @@

 # Grant access to these extra groups for mail processes. Typical use would be

 # to give "mail" group write access to /var/mail to be able to create dotlocks.

-#mail_extra_groups =

+# mail_extra_groups = mail

 # Allow full filesystem access to clients. There's no access checks other than

 # what the operating system does for the active UID/GID. It works with both

@@ -272,6 +272,7 @@

 # Dotlocking uses some tricks which may create more disk I/O than other locking

 # methods. NOTE: If you use NFS, remember to change also mmap_disable setting!

 #lock_method = fcntl

+lock_method = fcntl

 # Drop all privileges before exec()ing the mail process. This is mostly

 # meant for debugging, otherwise you don't get core dumps. It could be a small

@@ -468,19 +469,19 @@

 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 ~/dovecot.rawlog/ directory:

-  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap

+  #   mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap

   #

   # 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

@@ -530,11 +531,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

@@ -578,7 +579,7 @@

   # installations. %08Xu%08Xv will be the new default, so use it for new

   # installations.

   #

-  #pop3_uidl_format = 

+  pop3_uidl_format = %08Xu%08Xv

   # POP3 logout format string:

   #  %t - number of TOP commands

@@ -635,7 +636,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