svn commit: r1716132 - /spamassassin/branches/3.4/sa-update.raw

[mm...@apache.org]

Author: mmartinec
Date: Tue Nov 24 13:51:03 2015
New Revision: 1716132

URL: http://svn.apache.org/viewvc?rev=1716132&view=rev
Log:
Bug 7266 - no IPv6 address on sa-update.secnap.net - missing semicolon, tabs->space, aestetics

Modified:
    spamassassin/branches/3.4/sa-update.raw

Modified: spamassassin/branches/3.4/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-update.raw?rev=1716132&r1=1716131&r2=1716132&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-update.raw (original)
+++ spamassassin/branches/3.4/sa-update.raw Tue Nov 24 13:51:03 2015
@@ -741,13 +741,13 @@ foreach my $channel (@channels) {
       delete $mirrors{$mirror};
 
       if (!check_mirror_af($mirror)) {
-	  my @my_af;
-	  push(@my_af, "IPv4") if ($have_inet4);
-	  push(@my_af, "IPv6") if ($have_inet6);
-	  push(@my_af, "no IP service") if ($#my_af < 0) 
-	  dbg("reject mirror " . $mirror . ": no common address family"
-	      . " (" . join(" ", @af) . ")");
-	  next;
+        my @my_af;
+        push(@my_af, "IPv4") if $have_inet4;
+        push(@my_af, "IPv6") if $have_inet6;
+        push(@my_af, "no IP service") if !@my_af;
+        dbg("reject mirror %s: no common address family (%s)",
+            $mirror, join(" ", @af));
+        next;
       }
 
       dbg("channel: selected mirror $mirror");
@@ -866,7 +866,7 @@ foreach my $channel (@channels) {
       }
 
       # use the longest match we can find
-      $signer = $key if (length $key > length $signer);
+      $signer = $key if length $key > length $signer;
     }
 
     my $errno = 0;  close CMD or $errno = $!;
@@ -1608,8 +1608,8 @@ sub check_mirror_af {
     my ($mirror) = @_;
     my($a_rr, $aaaa_rr);
     $mirror =~ s/[a-z][a-z09]+:\/\///;  # strip http:// or https:// or other
-    return 1 if ($have_inet4 && do_dns_query($mirror, "A"));
-    return 1 if ($have_inet6 && do_dns_query($mirror, "AAAA"));
+    return 1 if $have_inet4 && do_dns_query($mirror, "A");
+    return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
     return 0;
 }