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

diff --git a/debian/postinst b/debian/postinst
index 99933b2..e931e54 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -211,12 +211,22 @@ if [ -f $examdir/local.cf ]; 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