***************
*** 758,764 ****
  auth default {
    # Space separated list of wanted authentication mechanisms:
    #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi
!   mechanisms = plain

    #
    # Password database is used to verify user's password (and nothing more).
--- 783,790 ----
  auth default {
    # Space separated list of wanted authentication mechanisms:
    #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi
!   #mechanisms = plain
!   mechanisms = plain login digest-md5 cram-md5

    #
    # Password database is used to verify user's password (and nothing more).
***************
*** 794,800 ****
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work.
    # http://wiki.dovecot.org/PasswordDatabase/PAM
!   passdb pam {
      # [blocking=yes] [session=yes] [setcred=yes]
      # [cache_key=<key>] [<service name>]
      #
--- 820,826 ----
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work.
    # http://wiki.dovecot.org/PasswordDatabase/PAM
!   # passdb pam {
      # [blocking=yes] [session=yes] [setcred=yes]
      # [cache_key=<key>] [<service name>]
      #
***************
*** 883,892 ****

    # vpopmail authentication
    # http://wiki.dovecot.org/AuthDatabase/VPopMail
!   #passdb vpopmail {
      # [cache_key=<key>] - See cache_key in PAM for explanation.
      #args =
!   #}

    #
    # User database specifies where mails are located and what user/group IDs
--- 910,920 ----

    # vpopmail authentication
    # http://wiki.dovecot.org/AuthDatabase/VPopMail
!   passdb vpopmail {
      # [cache_key=<key>] - See cache_key in PAM for explanation.
      #args =
!     args = cache_key=%u%r%l dovecot
!   }

    #
    # User database specifies where mails are located and what user/group IDs
***************
*** 900,907 ****
    # configured in /etc/nsswitch.conf. WARNING: nss_ldap is known to be broken
    # with Dovecot. Don't use it, or users might log in as each others!
    # http://wiki.dovecot.org/AuthDatabase/Passwd
!   userdb passwd {
!   }

    # passwd-like file with specified location
    # http://wiki.dovecot.org/AuthDatabase/PasswdFile
--- 928,935 ----
    # configured in /etc/nsswitch.conf. WARNING: nss_ldap is known to be broken
    # with Dovecot. Don't use it, or users might log in as each others!
    # http://wiki.dovecot.org/AuthDatabase/Passwd
! #  userdb passwd {
! #  }

    # passwd-like file with specified location
    # http://wiki.dovecot.org/AuthDatabase/PasswdFile
***************
*** 937,944 ****

    # vpopmail
    # http://wiki.dovecot.org/AuthDatabase/VPopMail
!   #userdb vpopmail {
!   #}

    # "prefetch" user database means that the passdb already provided the
    # needed information and there's no need to do a separate userdb lookup.
--- 965,972 ----

    # vpopmail
    # http://wiki.dovecot.org/AuthDatabase/VPopMail
!   userdb vpopmail {
!   }

    # "prefetch" user database means that the passdb already provided the
    # needed information and there's no need to do a separate userdb lookup.