X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=46e7587791316998914a4a5592f949bd3c1da515;hb=28f90847526b9bef11a509fd307a184bc58a7ffe;hp=eab468ef32771e3a02ce8d46abc68fa057188a9a;hpb=cbcf1f8c46e6a17e1b5b447cf896379c5b87f6d4;p=postfix-cn.git

diff --git a/debian/postinst b/debian/postinst
index eab468e..46e7587 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -81,14 +81,17 @@ postconf -e mynetworks="$mynetworks"
 
 # obrisati $mydomain, ako je upgrade sa starije verzije
 # te srediti mydestination
-if dpkg --compare-versions "$2" lt 2.3.8-1; then
+if dpkg --compare-versions "$2" lt 2.3.8-2; then
   mydestination="`postconf -h mydestination`"
   if echo $mydestination | grep -q ", \$mydomain"; then
     mydestination="`echo $mydestination | sed 's/, \$mydomain//g'`"
   fi
-  if echo $mydestination | grep -q "localhost.\$mydomain"; then
+  if ! echo $mydestination | grep -q "localhost.\$mydomain"; then
     mydestination="$mydestination, localhost.\$mydomain"
   fi
+  if ! echo $mydestination | grep -q "\$myhostname"; then
+    mydestination="\$myhostname, $mydestination"
+  fi
   postconf -e mydestination="$mydestination"
 fi
 
@@ -168,8 +171,8 @@ if [ "$rbl" ]; then
   done
 fi
 
-# dodaj check_policy_service i permit na kraj
-smtpd_recipient_restrictions="$smtpd_recipient_restrictions, check_policy_service inet:127.0.0.1:60000, permit"
+# dodaj permit na kraj
+smtpd_recipient_restrictions="$smtpd_recipient_restrictions, permit"
 postconf -e smtpd_recipient_restrictions="$smtpd_recipient_restrictions"
 
 # SASL stuff