X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=e931e54d852717789e405d2101197314494d794b;hb=451bbd0115b7bbec4281d40d43d5bbd8b889a316;hp=06d468fd4a3c48df6ee274b40db6ae3c719e4a54;hpb=2c7c2d79513b2038897c61c1a62830a2ed83cc9d;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index 06d468f..e931e54 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -202,13 +202,35 @@ if [ -f $examdir/local.cf ]; then
     # calculate trusted networks
     cp_get_netaddr || true
     netaddr="$RET"
+    # ... get already configured trusted networks
     trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
         $confdir/local.cf.$$)
-    for i in "127.0.0.0/8" "$netaddr"; do
+    # ... 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); 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
+            trusted_networks_clean="$trusted_networks_clean $i"
+        fi
+    done
+    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
+    fi
     cp_check_and_sed "^trusted_networks " \
         "s#^trusted_networks .*#trusted_networks $trusted_networks#g" \
         $confdir/local.cf.$$ || true