Package: greylistd
Severity: wishlist
Tags: patch

Please could you provide the rcpt/data blurbs for exim4 as examples in
/usr/share/doc/greylistd/examples ?

This way they can be .include'd in exim config files, in some nice ways such as
via CHECK_RCPT_LOCAL_ACL_FILE / CHECK_DATA_LOCAL_ACL_FILE hacks, etc.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-amd64-k8
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
diff -Nur greylistd-0.8.3.old/debian/examples greylistd-0.8.3/debian/examples
--- greylistd-0.8.3.old/debian/examples 2004-12-14 12:58:53.000000000 +0100
+++ greylistd-0.8.3/debian/examples     2006-07-03 17:42:29.000000000 +0200
@@ -1,3 +1,5 @@
 doc/examples/exim4-acl-example.txt
 doc/examples/whitelist-hosts
 
+debian/exim4_acl_data
+debian/exim4_acl_rcpt
diff -Nur greylistd-0.8.3.old/debian/exim4_acl_data 
greylistd-0.8.3/debian/exim4_acl_data
--- greylistd-0.8.3.old/debian/exim4_acl_data   1970-01-01 01:00:00.000000000 
+0100
+++ greylistd-0.8.3/debian/exim4_acl_data       2006-07-03 17:40:29.000000000 
+0200
@@ -0,0 +1,35 @@
+  # greylistd(8) configuration follows.
+  # This statement has been added by "greylistd-setup-exim4",
+  # and can be removed by running "greylistd-setup-exim4 remove".
+  # Any changes you make here will then be lost.
+  # 
+  # Perform greylisting on incoming messages with no envelope sender here.
+  # We did not subject these to greylisting after RCPT TO:, because that
+  # would interfere with remote hosts doing sender callout verifications.
+  #
+  # Because there is no sender address, we supply only two data items:
+  #  - The remote host address
+  #  - The recipient address (normally, bounces have only one recipient)
+  #
+  # We also check the local whitelist to avoid greylisting mail from
+  # hosts that are expected to forward mail here (such as backup MX hosts,
+  # list servers, etc).
+  #
+  defer
+    message        = $sender_host_address is not yet authorized to deliver \
+                     mail from <$sender_address> to <$recipients>. \
+                     Please try later.
+    log_message    = greylisted.
+    senders        = :
+    !hosts         = : +relay_from_hosts : \
+                     ${if exists {/etc/greylistd/whitelist-hosts}\
+                                 {/etc/greylistd/whitelist-hosts}{}} : \
+                     ${if exists {/var/lib/greylistd/whitelist-hosts}\
+                                 {/var/lib/greylistd/whitelist-hosts}{}}
+    !authenticated = *
+    !acl           = acl_whitelist_local_deny
+    condition      = ${readsocket{/var/run/greylistd/socket}\
+                                 {--grey \
+                                  $sender_host_address \
+                                  $recipients}\
+                                  {5s}{}{false}}
diff -Nur greylistd-0.8.3.old/debian/exim4_acl_rcpt 
greylistd-0.8.3/debian/exim4_acl_rcpt
--- greylistd-0.8.3.old/debian/exim4_acl_rcpt   1970-01-01 01:00:00.000000000 
+0100
+++ greylistd-0.8.3/debian/exim4_acl_rcpt       2006-07-03 17:41:11.000000000 
+0200
@@ -0,0 +1,42 @@
+  # greylistd(8) configuration follows.
+  # This statement has been added by "greylistd-setup-exim4",
+  # and can be removed by running "greylistd-setup-exim4 remove".
+  # Any changes you make here will then be lost.
+  # 
+  # Perform greylisting on incoming messages from remote hosts.
+  # We do NOT greylist messages with no envelope sender, because that
+  # would conflict with remote hosts doing callback verifications, and we
+  # might not be able to send mail to such hosts for a while (until the
+  # callback attempt is no longer greylisted, and then some).
+  #
+  # We also check the local whitelist to avoid greylisting mail from
+  # hosts that are expected to forward mail here (such as backup MX hosts,
+  # list servers, etc).
+  #
+  # Because the recipient address has not yet been verified, we do so
+  # now and skip this statement for non-existing recipients.  This is
+  # in order to allow for a 550 (reject) response below.  If the delivery
+  # happens over a remote transport (such as "smtp"), recipient callout
+  # verification is performed, with the original sender intact.
+  #
+  defer
+    message        = $sender_host_address is not yet authorized to deliver \
+                     mail from <$sender_address> to <[EMAIL PROTECTED]>. \
+                     Please try later.
+    log_message    = greylisted.
+    !senders       = :
+    !hosts         = : +relay_from_hosts : \
+                     ${if exists {/etc/greylistd/whitelist-hosts}\
+                                 {/etc/greylistd/whitelist-hosts}{}} : \
+                     ${if exists {/var/lib/greylistd/whitelist-hosts}\
+                                 {/var/lib/greylistd/whitelist-hosts}{}}
+    !authenticated = *
+    !acl           = acl_whitelist_local_deny
+    domains        = +local_domains : +relay_to_domains
+    verify         = recipient/callout=20s,use_sender,defer_ok
+    condition      = ${readsocket{/var/run/greylistd/socket}\
+                                 {--grey \
+                                  $sender_host_address \
+                                  $sender_address \
+                                  [EMAIL PROTECTED]
+                                 {5s}{}{false}}
diff -Nur greylistd-0.8.3.old/program/greylistd-setup-exim4 
greylistd-0.8.3/program/greylistd-setup-exim4
--- greylistd-0.8.3.old/program/greylistd-setup-exim4   2005-01-06 
06:48:48.000000000 +0100
+++ greylistd-0.8.3/program/greylistd-setup-exim4       2006-07-03 
17:44:17.000000000 +0200
@@ -35,87 +35,10 @@
 
 ### What text do we add to which ACLs?
 exim4conf_texts = {
-    "rcpt" : '''  # greylistd(8) configuration follows.
-  # This statement has been added by "greylistd-setup-exim4",
-  # and can be removed by running "greylistd-setup-exim4 remove".
-  # Any changes you make here will then be lost.
-  # 
-  # Perform greylisting on incoming messages from remote hosts.
-  # We do NOT greylist messages with no envelope sender, because that
-  # would conflict with remote hosts doing callback verifications, and we
-  # might not be able to send mail to such hosts for a while (until the
-  # callback attempt is no longer greylisted, and then some).
-  #
-  # We also check the local whitelist to avoid greylisting mail from
-  # hosts that are expected to forward mail here (such as backup MX hosts,
-  # list servers, etc).
-  #
-  # Because the recipient address has not yet been verified, we do so
-  # now and skip this statement for non-existing recipients.  This is
-  # in order to allow for a 550 (reject) response below.  If the delivery
-  # happens over a remote transport (such as "smtp"), recipient callout
-  # verification is performed, with the original sender intact.
-  #
-  defer
-    message        = $sender_host_address is not yet authorized to deliver \\
-                     mail from <$sender_address> to <[EMAIL PROTECTED]>. \\
-                     Please try later.
-    log_message    = greylisted.
-    !senders       = :
-    !hosts         = : +relay_from_hosts : \\
-                     ${if exists {/etc/greylistd/whitelist-hosts}\\
-                                 {/etc/greylistd/whitelist-hosts}{}} : \\
-                     ${if exists {/var/lib/greylistd/whitelist-hosts}\\
-                                 {/var/lib/greylistd/whitelist-hosts}{}}
-    !authenticated = *
-    !acl           = acl_whitelist_local_deny
-    domains        = +local_domains : +relay_to_domains
-    verify         = recipient/callout=20s,use_sender,defer_ok
-    condition      = ${readsocket{/var/run/greylistd/socket}\\
-                                 {--grey \\
-                                  %s \\
-                                  $sender_address \\
-                                  [EMAIL PROTECTED]
-                                 {5s}{}{false}}
-
+    "rcpt" : '''  .include /usr/share/doc/greylistd/examples/exim4_acl_rcpt
 ''',
 
-    "data" : '''  # greylistd(8) configuration follows.
-  # This statement has been added by "greylistd-setup-exim4",
-  # and can be removed by running "greylistd-setup-exim4 remove".
-  # Any changes you make here will then be lost.
-  # 
-  # Perform greylisting on incoming messages with no envelope sender here.
-  # We did not subject these to greylisting after RCPT TO:, because that
-  # would interfere with remote hosts doing sender callout verifications.
-  #
-  # Because there is no sender address, we supply only two data items:
-  #  - The remote host address
-  #  - The recipient address (normally, bounces have only one recipient)
-  #
-  # We also check the local whitelist to avoid greylisting mail from
-  # hosts that are expected to forward mail here (such as backup MX hosts,
-  # list servers, etc).
-  #
-  defer
-    message        = $sender_host_address is not yet authorized to deliver \\
-                     mail from <$sender_address> to <$recipients>. \\
-                     Please try later.
-    log_message    = greylisted.
-    senders        = :
-    !hosts         = : +relay_from_hosts : \\
-                     ${if exists {/etc/greylistd/whitelist-hosts}\\
-                                 {/etc/greylistd/whitelist-hosts}{}} : \\
-                     ${if exists {/var/lib/greylistd/whitelist-hosts}\\
-                                 {/var/lib/greylistd/whitelist-hosts}{}}
-    !authenticated = *
-    !acl           = acl_whitelist_local_deny
-    condition      = ${readsocket{/var/run/greylistd/socket}\\
-                                 {--grey \\
-                                  %s \\
-                                  $recipients}\\
-                                  {5s}{}{false}}
-
+    "data" : '''  .include /usr/share/doc/greylistd/examples/exim4_acl_data
 '''
     }
 

Reply via email to