From: Dinko Korunic <kreator@carnet.hr>
Date: Tue, 31 Mar 2009 11:32:40 +0000 (+0200)
Subject: - spajanje konfiguracije sa Postfix listom iz mynetworks
X-Git-Tag: v3.3.1-1~5
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=451bbd0115b7bbec4281d40d43d5bbd8b889a316;p=spamassassin-cn.git

- spajanje konfiguracije sa Postfix listom iz mynetworks
---

diff --git a/debian/changelog b/debian/changelog
index 016445b..6f6a9df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spamassassin-cn (2:3.2.5-6) stable; urgency=low
+
+  * spajanje IP klasa iz mynetworks Postfix konfiguracije u trusted_networks
+
+ -- Dinko Korunic <kreator@carnet.hr>  Tue, 31 Mar 2009 12:59:44 +0200
+
 spamassassin-cn (2:3.2.5-5) stable; urgency=low
 
   * ciscenje 127.0.0.0/8 iz trusted_networks konfiguracije
diff --git a/debian/postinst b/debian/postinst
index c6e4e1c..e931e54 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -211,6 +211,14 @@ 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