From 3664a44cadd0ad701966a401f50729dd0bd40e53 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Fri, 21 Jul 2006 18:52:56 +0000 Subject: > Ok. This is #378935 (I sent a patch before). May I check it in? It is ok with me, and can easily backed out again if Marc disagrees (and he has the final say on exim nowadays), so go ahead. * Add conf.d/acl/25_exim4-config_check_mail to reject mail without HELO/EHLO. (rm) Closes: #378935 svn path=/exim/trunk/; revision=1507 --- debian/changelog | 2 ++ debian/debconf/conf.d/acl/25_exim4-config_check_mail | 14 ++++++++++++++ debian/debconf/conf.d/main/02_exim4-config_options | 9 +++++++++ 3 files changed, 25 insertions(+) create mode 100644 debian/debconf/conf.d/acl/25_exim4-config_check_mail diff --git a/debian/changelog b/debian/changelog index 1da71c3..f5c333a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ exim4 (4.62-2.0) UNRELEASED; urgency=low give outdated and/or wrong advice. See #378684, #378685. * Add (disabled) template to check SPF. Add libmail-spf-query-perl to Suggests, and remove Q/A about SPF from README.Debian. (rm) Closes: #290464 + * Add conf.d/acl/25_exim4-config_check_mail to reject mail without HELO/EHLO. + (rm) Closes: #378935 -- Marc Haber Wed, 19 Jul 2006 15:43:21 +0200 diff --git a/debian/debconf/conf.d/acl/25_exim4-config_check_mail b/debian/debconf/conf.d/acl/25_exim4-config_check_mail new file mode 100644 index 0000000..e40e642 --- /dev/null +++ b/debian/debconf/conf.d/acl/25_exim4-config_check_mail @@ -0,0 +1,14 @@ + +### acl/25_exim4-config_check_mail +################################# + +# This access control list is used for every MAIL command in an incoming +# SMTP message. The tests are run in order until the address is either +# accepted or denied. +# +acl_check_mail: + deny + message = polite people say hello first + condition = ${if def:sender_helo_name {no}{yes}} + + accept diff --git a/debian/debconf/conf.d/main/02_exim4-config_options b/debian/debconf/conf.d/main/02_exim4-config_options index fb2d69a..e0bda89 100644 --- a/debian/debconf/conf.d/main/02_exim4-config_options +++ b/debian/debconf/conf.d/main/02_exim4-config_options @@ -3,6 +3,15 @@ ################################# +# Defines the access control list that is run when an +# SMTP MAIL command is received. +# +.ifndef MAIN_ACL_CHECK_MAIL +MAIN_ACL_CHECK_MAIL = acl_check_mail +.endif +acl_smtp_mail = MAIN_ACL_CHECK_MAIL + + # Defines the access control list that is run when an # SMTP RCPT command is received. # -- cgit v1.2.3