X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=c9723b9e450e715f7085c84c8d9d9e5dfc962741;hb=bdeb3fc61c13663caa404f4a86658b50fce1ed04;hp=0d7655889c0577efe842a50295b48ebb268c25ac;hpb=3223eab926b22668ca52e098575cc3927435dd1d;p=dovecot-cn.git

diff --git a/debian/postinst b/debian/postinst
index 0d76558..c9723b9 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 [ "$1" = "configure" ] || exit 0
+[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
 # Load CARNet Tools
 . /usr/share/carnet-tools/functions.sh
@@ -18,12 +19,20 @@ cp_check_and_sed 'disable_plaintext_auth.*yes' \
                  's/disable_plaintext_auth.*$/disable_plaintext_auth = no/g' \
 		 /etc/dovecot/dovecot.conf || true
 
-cp_check_and_sed '#client_workarounds' \
-                 's/#client_workarounds/client_workarounds/g' \
+cp_check_and_sed '#imap_client_workarounds' \
+                 's/#imap_client_workarounds/imap_client_workarounds/g' \
 		 /etc/dovecot/dovecot.conf || true
 
-cp_check_and_sed 'client_workarounds' \
-                 's/client_workarounds.*$/client_workarounds = outlook-idle/g' \
+cp_check_and_sed '#pop3_client_workarounds' \
+                 's/#pop3_client_workarounds/pop3_client_workarounds/g' \
+		 /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed 'imap_client_workarounds' \
+                 's/imap_client_workarounds.*$/imap_client_workarounds = outlook-idle tb-extra-mailbox-sep netscape-eoh delay -newmail/g' \
+		 /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed 'pop3_client_workarounds' \
+                 's/pop3_client_workarounds.*$/pop3_client_workarounds = outlook-no-nuls oe-ns-eoh/g' \
 		 /etc/dovecot/dovecot.conf || true