*** postfix-policyd-spf-perl.orig	Thu Apr 19 04:53:19 2007
--- postfix-policyd-spf-perl	Thu May 31 18:16:29 2007
***************
*** 250,259 ****
      
      # Reject on HELO fail.  Defer on HELO temperror if message would otherwise
      # be accepted.  Use the HELO result and return for null sender.
!     if ($helo_result->is_code('fail')) {
!         return "550 $helo_authority_exp";
!     }
!     elsif ($helo_result->is_code('temperror')) {
          return "DEFER_IF_PERMIT SPF-Result=$helo_local_exp";
      }
      elsif ($attr->{sender} eq '') {
--- 250,260 ----
      
      # Reject on HELO fail.  Defer on HELO temperror if message would otherwise
      # be accepted.  Use the HELO result and return for null sender.
! #    if ($helo_result->is_code('fail')) {
! #        return "550 $helo_authority_exp";
! #    }
! #    elsif ($helo_result->is_code('temperror')) {
!     if ($helo_result->is_code('temperror')) {
          return "DEFER_IF_PERMIT SPF-Result=$helo_local_exp";
      }
      elsif ($attr->{sender} eq '') {
***************
*** 309,318 ****
      };
      
      # Same approach as HELO....
!     if ($mfrom_result->is_code('fail')) {
!         return "550 $mfrom_authority_exp";
!     }
!     elsif ($mfrom_result->is_code('temperror')) {
          return "DEFER_IF_PERMIT SPF-Result=$mfrom_local_exp";
      }
      else {
--- 310,320 ----
      };
      
      # Same approach as HELO....
! #    if ($mfrom_result->is_code('fail')) {
! #        return "550 $mfrom_authority_exp";
! #    }
! #    elsif ($mfrom_result->is_code('temperror')) {
!     if ($mfrom_result->is_code('temperror')) {
          return "DEFER_IF_PERMIT SPF-Result=$mfrom_local_exp";
      }
      else {