On Mon, Aug 30, 2010 at 01:56:20PM +0100, Dominic Hargreaves wrote:
> On Mon, Aug 30, 2010 at 01:52:52PM +0100, Dominic Hargreaves wrote:
>
> > In fact, the related bug #464084 reports a situation where the callouts
> > actually cause messages to be accepted when they shouldn't be, so I will
> > also remove the callouts.
>
> Uploading later with the attached patch.
Uploaded. Actual patch attached.
--
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)
diff --git a/debian/changelog b/debian/changelog
index 2e0432b..11bbcda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+greylistd (0.8.7+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add missing recipient domains check in deny portion of Exim ACL,
+ and stop doing recipient callouts in defer and deny ACLs
+ (Closes: #591678, #464084)
+ * Fix lintian error: don't include /var/run/greylistd in package
+ (init script already creates it dynamically)
+
+ -- Dominic Hargreaves <d...@earth.li> Mon, 30 Aug 2010 16:59:54 +0100
+
greylistd (0.8.7+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/dirs b/debian/dirs
index f534d8a..a50b10a 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,3 @@
usr/sbin
etc/greylistd
var/lib/greylistd
-var/run/greylistd
diff --git a/program/greylistd-setup-exim4 b/program/greylistd-setup-exim4
index e9a0cd5..2965829 100755
--- a/program/greylistd-setup-exim4
+++ b/program/greylistd-setup-exim4
@@ -70,7 +70,7 @@ exim4conf_texts = {
!authenticated = *
!acl = acl_local_deny_exceptions
domains = +local_domains : +relay_to_domains
- verify = recipient/callout=20s,use_sender,defer_ok
+ verify = recipient
condition = ${readsocket{/var/run/greylistd/socket}\\
{--grey \\
%s \\
@@ -85,7 +85,8 @@ exim4conf_texts = {
log_message = blacklisted.
!senders = :
!authenticated = *
- verify = recipient/callout=20s,use_sender,defer_ok
+ domains = +local_domains : +relay_to_domains
+ verify = recipient
condition = ${readsocket{/var/run/greylistd/socket}\\
{--black \\
$sender_host_address \\
