X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ff854eb0cedb5a1637cc2fe54bfab23f7882bd34;hb=edbb239a67bd663c98c042c0d6da6af875c4ec6d;hp=99933b270a96fbc6e5cde0e4783d7a8754c3979c;hpb=a4357a448ea1431981da0fd6cc3dde70eeeeedd7;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index 99933b2..ff854eb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -204,19 +204,31 @@ if [ -f $examdir/local.cf ]; then
     netaddr="$RET"
     # ... get already configured trusted networks
     trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
-        $confdir/local.cf.$$)
+        $confdir/local.cf.$$ | sed -e 's/,/ /g')
     # ... merge with local networks configured on eth interfaces
     for i in $netaddr; do
         if ! echo "$trusted_networks" | grep -q "$i"; then
             trusted_networks="$trusted_networks $i"
         fi
     done
+    # ... merge with Postfix ranges
+    if [ -x /usr/sbin/postconf ]; then
+        for i in $(postconf -h mynetworks | sed -e 's/,/ /g'); do
+            if ! echo "$trusted_networks" | grep -q "$i"; then
+                trusted_networks="$trusted_networks $i"
+            fi
+        done
+    fi
     # ... strip 127/8 range
     for i in $trusted_networks; do
-        if ! echo "$i" | grep -q "127.0.0.0/8"; then
+        if ! echo "$i" | egrep -q \
+            "127.0.0.0/8|\[::1\]/128|\[::ffff:127.0.0.0\]/104"; then
             trusted_networks_clean="$trusted_networks_clean $i"
         fi
     done
+    # ... strip left and right blanks from final string
+    trusted_networks_clean=$(echo "$trusted_networks_clean" \
+        |  sed 's/^[ \t]*//;s/[ \t]*$//')
     # ... and replace if non-zero
     if [ ! -z "$trusted_networks_clean" ]; then
         trusted_networks=$trusted_networks_clean