From 1486640042b77fff185f4978bf8b33d31ace8f48 Mon Sep 17 00:00:00 2001
From: Julian Mehnle <>
Date: Fri, 14 Dec 2007 23:05:20 +0000
Subject: [PATCH] postfix-policyd-spf-perl/trunk/postfix-policyd-spf-perl *
 Bumped version number to 2.005 in prospect of the next release. * Decreased
 timeout for DNS queries via UDP to 10s from Net::DNS::Resolver's   default of
 40s (by doing only 1 retransmission rather than 3 after a query   fails). 
 Until Mail::SPF provides an explicit option for this, we just   create our
 own resolver object and make Mail::SPF use that.

postfix-policyd-spf-perl/trunk/CHANGES
* Described the above change.
* Fixed typos in the names of Wietse Venema and Julian Mehnle.
---
 CHANGES                  |  9 +++++++--
 postfix-policyd-spf-perl | 14 +++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index eceac30..33f5fff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,9 +3,14 @@
 #   + = Added a feature (in a backwards compatible way)
 #   ! = Changed something significant, or removed a feature
 #   * = Fixed a bug, or made a minor improvement
+
 --- UNRELEASED (2007-04-30 19:03)
+  * Decreased timeout for DNS queries via UDP to 10s from Net::DNS::Resolver's
+    default of 40s (by doing only 1 retransmission rather than 3 after a query
+    fails).  Until Mail::SPF provides an explicit option for this, we just
+    create our own resolver object and make Mail::SPF use that.
   * Adjust master.cf recommendations in INSTALL for new recommendations from
-    Weitse Venema (postfix-users mailing list).
+    Wietse Venema (postfix-users mailing list).
 
 --- 2.004 (2007-04-18 15:36)
   * Fix header text to work with Postfix (access 5 requirements).
@@ -15,7 +20,7 @@
   + Add handler for list of relay addresses to bypass.
 
 --- 2.002 (2007-02-20 05:45)
-  * Added Julian Menhle to copyright statement.
+  * Added Julian Mehnle to copyright statement.
   * Implemented results cache in order to prevent redundant SPF checks in
     multiple invocations per message instance.  This also enables us to prepend
     a "Received-SPF" header only once per message instance (as opposed to once
diff --git a/postfix-policyd-spf-perl b/postfix-policyd-spf-perl
index 41767d7..3915555 100755
--- a/postfix-policyd-spf-perl
+++ b/postfix-policyd-spf-perl
@@ -2,7 +2,7 @@
 
 # postfix-policyd-spf-perl
 # http://www.openspf.org/Software
-# version 2.004
+# version 2.005
 #
 # (C) 2007      Scott Kitterman <scott@kitterman.com>
 # (C) 2007      Julian Mehnle <julian@mehnle.net>
@@ -22,7 +22,7 @@
 #    with this program; if not, write to the Free Software Foundation, Inc.,
 #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-use version; our $VERSION = qv('2.004');
+use version; our $VERSION = qv('2.005');
 
 use strict;
 
@@ -35,7 +35,15 @@ use Mail::SPF;
 #                      configuration
 # ----------------------------------------------------------
 
-my $spf_server = Mail::SPF::Server->new();
+my $resolver = Net::DNS::Resolver->new(
+    retrans         => 5,  # Net::DNS::Resolver default: 5
+    retry           => 2,  # Net::DNS::Resolver default: 4
+    # Makes for a total timeout for UDP queries of 5s * 2 = 10s.
+);
+
+my $spf_server = Mail::SPF::Server->new(
+    dns_resolver    => $resolver
+);
 
 # Adding more handlers is easy:
 my @HANDLERS = (