fixes and improvements

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index 65682c2971f513a64b29c207633ca4888397725c..e753fbe9670ea27f7837b14be795d1ce5d7c95af 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -885,7 +885,7 @@ EOF
 
 case $HOSTNAME in
   bk)
-u /etc/spamassassin/my_thishost.cf <<'EOF'
+    u /etc/spamassassin/my_thishost.cf <<'EOF'
 # note: these are duplicated in exim config
 # veth0/1 # bk bk_ip6
 internal_networks 10.173.8.1/32 10.173.8.2/32 85.119.83.50/32 2001:ba8:1f1:f0c9::2
@@ -908,8 +908,8 @@ EOF
 internal_networks 10.173.8.1/32 10.173.8.2/32 72.14.176.105/32 2600:3c00::f03c:91ff:fe6d:baf8/128
 trusted_networks 10.173.8.1/32 10.173.8.2/32 72.14.176.105/32 2600:3c00::f03c:91ff:fe6d:baf8/128
 EOF
-;;
-  esac
+    ;;
+esac
 
 #####   end spamassassin config
 
@@ -3690,6 +3690,9 @@ EOF
 
       test_to=${test_tos[0]}
       for t in ${test_tos[@]:1}; do
+        if [[ $test_from == *@gnu.org && $t == *@gnu.org ]]; then
+          continue
+        fi
         test_to+=", $t"
       done
       case $test_from in