diff options
| author | Robert Millan <rmh@debian.org> | 2006-07-26 11:11:08 +0000 |
|---|---|---|
| committer | Robert Millan <rmh@debian.org> | 2006-07-26 11:11:08 +0000 |
| commit | a98a2578c7f0ec189ed2d59299c7b2f119e1be99 (patch) | |
| tree | d8bb40d810bc0e1a2fc42c93836888c1211eb25e | |
| parent | a431a833c4ff58d31c566096c15b8a75d2f65833 (diff) | |
| download | exim4-a98a2578c7f0ec189ed2d59299c7b2f119e1be99.tar.gz | |
30_exim4-config_check_rcpt (SPF): In case spfquery invokation returns unexpected error (command not found, syntax error, etc), issue a warning, and avoid generating SPF headers.
svn path=/exim/trunk/; revision=1520
| -rw-r--r-- | debian/debconf/conf.d/acl/30_exim4-config_check_rcpt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt b/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt index db80da5..31381e2 100644 --- a/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt +++ b/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt @@ -228,12 +228,18 @@ acl_check_rcpt: warn message = Received-SPF: ${if eq {$runrc}{0}{pass}{${if eq {$runrc}{2}{softfail}\ {${if eq {$runrc}{3}{neutral}{${if eq {$runrc}{4}{unknown}{${if eq {$runrc}{6}{none}{error}}}}}}}}}} + condition = ${if <={$runrc}{6}{yes}{no}} + + warn + log_message = Unexpected error in SPF check. + condition = ${if >{$runrc}{6}{yes}{no}} # Support for best-guess (see http://www.openspf.org/developers-guide.html) warn message = X-SPF-Guess: ${run{/usr/bin/spfquery --ip \"$sender_host_address\" --mail-from \"$sender_address\" \ --helo \"$sender_helo_name\" --guess true}\ {pass}{${if eq {$runrc}{2}{softfail}{${if eq {$runrc}{3}{neutral}{${if eq {$runrc}{4}{unknown}\ {${if eq {$runrc}{6}{none}{error}}}}}}}}}} + condition = ${if <={$runrc}{6}{yes}{no}} defer message = Temporary DNS error while checking SPF record. Try again later. |