386c00
diff -up dovecot-2.2.10/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.2.10/doc/example-config/conf.d/10-mail.conf
386c00
--- dovecot-2.2.10/doc/example-config/conf.d/10-mail.conf.default-settings	2013-04-23 12:33:55.000000000 +0200
386c00
+++ dovecot-2.2.10/doc/example-config/conf.d/10-mail.conf	2016-06-17 17:56:17.353210369 +0200
386c00
@@ -165,7 +165,7 @@ namespace inbox {
386c00
 # to make sure that users can't log in as daemons or other system users.
386c00
 # Note that denying root logins is hardcoded to dovecot binary and can't
386c00
 # be done even if first_valid_uid is set to 0.
386c00
-#first_valid_uid = 500
386c00
+first_valid_uid = 1000
386c00
 #last_valid_uid = 0
386c00
 
386c00
 # Valid GID range for users, defaults to non-root/wheel. Users having
386c00
@@ -286,6 +286,7 @@ namespace inbox {
86587c
 # them simultaneously.
86587c
 #mbox_read_locks = fcntl
86587c
 #mbox_write_locks = dotlock fcntl
86587c
+mbox_write_locks = fcntl
86587c
 
86587c
 # Maximum time to wait for lock (all of them) before aborting.
86587c
 #mbox_lock_timeout = 5 mins
386c00
diff -up dovecot-2.2.10/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.2.10/doc/example-config/conf.d/10-ssl.conf
386c00
--- dovecot-2.2.10/doc/example-config/conf.d/10-ssl.conf.default-settings	2013-11-19 21:36:30.000000000 +0100
386c00
+++ dovecot-2.2.10/doc/example-config/conf.d/10-ssl.conf	2016-06-17 17:54:18.749626750 +0200
86587c
@@ -3,7 +3,9 @@
86587c
 ##
86587c
 
86587c
 # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
86587c
-#ssl = yes
86587c
+# disable plain pop3 and imap, allowed are only pop3+TLS, pop3s, imap+TLS and imaps
86587c
+# plain imap and pop3 are still allowed for local connections
86587c
+ssl = required
86587c
 
86587c
 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
86587c
 # dropping root privileges, so keep the key file unreadable by anyone but