svn commit: r442014 - /spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm

[fe...@apache.org]

Author: felicity
Date: Sun Sep 10 14:59:20 2006
New Revision: 442014

URL: http://svn.apache.org/viewvc?view=rev&rev=442014
Log:
bug 4463: allow dns_available to accept 0 and 1 as no and yes alternates

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&rev=442014&r1=442013&r2=442014
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sun Sep 10 14:59:20 2006
@@ -816,8 +816,18 @@
     default => 'test',
     code => sub {
       my ($self, $key, $value, $line) = @_;
-      if ($value !~ /^(yes|no|test|test:\s+.+)$/) { return $INVALID_VALUE; }
-      $self->{dns_available} = ($1 or "test");
+      if ($value =~ /^test(?::\s+.+)?$/) {
+        $self->{dns_available} = $value;
+      }
+      elsif ($value =~ /^(?:yes|1)$/) {
+        $self->{dns_available} = 'yes';
+      }
+      elsif ($value =~ /^(?:no|0)$/) {
+        $self->{dns_available} = 'no';
+      }
+      else {
+        return $INVALID_VALUE;
+      }
     }
   });