--- a/dovecot-example.conf	Thu Jul 10 03:40:25 2003 +0300
+++ b/dovecot-example.conf	Thu Jul 10 06:04:07 2003 +0300
@@ -18,13 +18,11 @@
 # "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4
 # interfaces depending on the operating system. You can specify ports with
 # "host:port".
-#imap_listen = *
-#pop3_listen = *
+#listen = *
 
 # IP or host address where to listen in for SSL connections. Defaults
-# to above non-SSL equilevants if not specified.
-#imaps_listen = 
-#pop3s_listen = 
+# to above if not specified.
+#ssl_listen =
 
 # Disable SSL/TLS support.
 #ssl_disable = no
@@ -73,16 +71,6 @@
 # wish to run the whole Dovecot without roots.
 #login_chroot = yes
 
-
-##
-## IMAP login process
-##
-
-login = imap
-
-# Executable location.
-#login_executable = /usr/libexec/dovecot/imap-login
-
 # User to use for the login process. Create a completely new user for this,
 # 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.
@@ -116,17 +104,6 @@
 # logging in actually login_processes_count * max_logging_users.
 #login_max_logging_users = 256
 
-##
-## POP3 login process
-##
-
-# Settings default to same as above, so you don't have to set anything
-# unless you want to override them.
-
-login = pop3
-
-# Exception to above rule being the executable location.
-#login_executable = /usr/libexec/dovecot/pop3-login
 
 ##
 ## Mail processes
@@ -309,40 +286,46 @@
 # for multiple users, as the users could ptrace() each others processes then.
 #mail_drop_priv_before_exec = no
 
-##
-## IMAP process
-##
-
-# Executable location
-#imap_executable = /usr/libexec/dovecot/imap
-
 # Set max. process size in megabytes. Most of the memory goes to mmap()ing
 # files, so it shouldn't harm much even if this limit is set pretty high.
-#imap_process_size = 256
-
-# 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
-# "Too long argument" or "IMAP command line too large" errors often.
-#imap_max_line_length = 65536
-
-# Support for dynamically loadable modules.
-#imap_use_modules = no
-#imap_modules = /usr/lib/dovecot/imap
+#mail_process_size = 256
 
 ##
-## POP3 process
+## IMAP specific settings
 ##
 
-# Executable location
-#pop3_executable = /usr/libexec/dovecot/pop3
+protocol imap {
+  # Login executable location.
+  #login_executable = /usr/libexec/dovecot/imap-login
+
+  # IMAP executable location
+  #mail_executable = /usr/libexec/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
+  # "Too long argument" or "IMAP command line too large" errors often.
+  #imap_max_line_length = 65536
 
-# Set max. process size in megabytes. Most of the memory goes to mmap()ing
-# files, so it shouldn't harm much even if this limit is set pretty high.
-#pop3_process_size = 256
+  # Support for dynamically loadable modules.
+  #mail_use_modules = no
+  #mail_modules = /usr/lib/dovecot/imap
+}
+  
+##
+## POP3 specific settings
+##
 
-# Support for dynamically loadable modules.
-#pop3_use_modules = no
-#pop3_modules = /usr/lib/dovecot/pop3
+protocol pop3 {
+  # Login executable location.
+  #login_executable = /usr/libexec/dovecot/pop3-login
+
+  # POP3 executable location
+  #mail_executable = /usr/libexec/dovecot/pop3
+
+  # Support for dynamically loadable modules.
+  #mail_use_modules = no
+  #mail_modules = /usr/lib/dovecot/pop3
+}
 
 ##
 ## Authentication processes
@@ -358,12 +341,11 @@
 # processes (unless they have different auth methods, and you're ok with
 # having different password for each method).
 
-# Authentication process name.
-auth = default
+# Executable location
+#auth_executable = /usr/libexec/dovecot/dovecot-auth
 
-# Space separated list of wanted authentication mechanisms:
-#   plain digest-md5 anonymous
-auth_mechanisms = plain
+# Set max. process size in megabytes.
+#auth_process_size = 256
 
 # Space separated list of realms for SASL authentication mechanisms that need
 # them. You can leave it empty if you don't want to support multiple realms.
@@ -374,43 +356,6 @@
 # Default realm to use if none was specified.
 #auth_default_realm = 
 
-# Where user database is kept:
-#   passwd: /etc/passwd or similiar, using getpwnam()
-#   passwd-file <path>: passwd-like file with specified location
-#   static uid=<uid> gid=<gid> home=<dir template>: static settings
-#   vpopmail: vpopmail library
-#   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
-#   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
-auth_userdb = passwd
-
-# Where password database is kept:
-#   passwd: /etc/passwd or similiar, using getpwnam()
-#   shadow: /etc/shadow or similiar, using getspnam()
-#   pam [<service> | *]: PAM authentication
-#   passwd-file <path>: passwd-like file with specified location
-#   vpopmail: vpopmail authentication
-#   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
-#   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
-auth_passdb = pam
-
-# Executable location
-#auth_executable = /usr/libexec/dovecot/dovecot-auth
-
-# Set max. process size in megabytes.
-#auth_process_size = 256
-
-# User to use for the process. This user needs access to only user and
-# password databases, nothing else. Only shadow and pam authentication
-# requires roots, so use something else if possible.
-auth_user = root
-
-# Directory where to chroot the process. Most authentication backends don't
-# work if this is set, and there's no point chrooting if auth_user is root.
-#auth_chroot = 
-
-# Number of authentication processes to create
-#auth_count = 1
-
 # List of allowed characters in username. If the user-given username contains
 # a character not listed in here, the login automatically fails. This is just
 # an extra check to make sure user can't exploit any potential quote escaping
@@ -425,18 +370,54 @@
 # working.
 #auth_verbose = no
 
+auth default {
+  # Space separated list of wanted authentication mechanisms:
+  #   plain digest-md5 anonymous
+  auth_mechanisms = plain
+
+  # Where user database is kept:
+  #   passwd: /etc/passwd or similiar, using getpwnam()
+  #   passwd-file <path>: passwd-like file with specified location
+  #   static uid=<uid> gid=<gid> home=<dir template>: static settings
+  #   vpopmail: vpopmail library
+  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
+  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
+  auth_userdb = passwd
+
+  # Where password database is kept:
+  #   passwd: /etc/passwd or similiar, using getpwnam()
+  #   shadow: /etc/shadow or similiar, using getspnam()
+  #   pam [<service> | *]: PAM authentication
+  #   passwd-file <path>: passwd-like file with specified location
+  #   vpopmail: vpopmail authentication
+  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
+  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
+  auth_passdb = pam
+
+  # User to use for the process. This user needs access to only user and
+  # password databases, nothing else. Only shadow and pam authentication
+  # requires roots, so use something else if possible.
+  auth_user = root
+
+  # Directory where to chroot the process. Most authentication backends don't
+  # work if this is set, and there's no point chrooting if auth_user is root.
+  #auth_chroot = 
+
+  # Number of authentication processes to create
+  #auth_count = 1
+}
+
 # digest-md5 authentication process. It requires special MD5 passwords which
 # /etc/shadow and PAM doesn't support, so we never need roots to handle it.
 # Note that the passwd-file is opened before chrooting and dropping root
 # privileges, so it may be 0600-root owned file.
 
-#auth = digest_md5
-#auth_methods = digest-md5
-#auth_realms = 
-#auth_userdb = passwd-file /etc/passwd.imap
-#auth_passdb = passwd-file /etc/passwd.imap
-#auth_user = imapauth
-#auth_chroot = 
+#auth digest_md5 {
+#  auth_methods = digest-md5
+#  auth_userdb = passwd-file /etc/passwd.imap
+#  auth_passdb = passwd-file /etc/passwd.imap
+#  auth_user = imapauth
+#}
 
 # if you plan to use only passwd-file, you don't need the two auth processes,
 # simply set "auth_methods = plain digest-md5"