From 8fde9903e121cba1a4381d7126d6642561b2af4c Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Thu, 17 Jan 2008 13:10:37 +0000 Subject: [PATCH] Copied Toms changes to the correct doc source file --- doc/doc-docbook/spec.xfpt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index a4bbac4bf..9578b21a2 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -1,4 +1,4 @@ -. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.28 2008/01/17 12:56:12 nm4 Exp $ +. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.29 2008/01/17 13:10:37 nm4 Exp $ . . ///////////////////////////////////////////////////////////////////////////// . This is the primary source of the Exim Manual. It is an xfpt document that is @@ -28047,6 +28047,10 @@ condition defers. &*Warning*&: It is not possible to use the UNIX socket connection method with multiple &%spamd%& servers. +The &%spamd_address%& variable is expanded before use if it starts with +a dollar sign. In this case, the expansion may return a string that is +used as the list so that multiple spamd servers can be the result of an +expansion. .section "Calling SpamAssassin from an Exim ACL" "SECID206" Here is a simple example of the use of the &%spam%& condition in a DATA ACL: @@ -28117,14 +28121,15 @@ A multiline text table, containing the full SpamAssassin report for the message. Useful for inclusion in headers or reject messages. .endlist -The &%spam%& condition caches its results. If you call it again with the same -user name, it does not scan again, but rather returns the same values as -before. +The &%spam%& condition caches its results unless expansion in +spamd_address was used. If you call it again with the same user name, it +does not scan again, but rather returns the same values as before. -The &%spam%& condition returns DEFER if there is any error while running the -message through SpamAssassin. If you want to treat DEFER as FAIL (to pass on to -the next ACL statement block), append &`/defer_ok`& to the right-hand side of -the spam condition, like this: +The &%spam%& condition returns DEFER if there is any error while running +the message through SpamAssassin or if the expansion of spamd_address +failed. If you want to treat DEFER as FAIL (to pass on to the next ACL +statement block), append &`/defer_ok`& to the right-hand side of the +spam condition, like this: .code deny message = This message was classified as SPAM spam = joe/defer_ok -- 2.25.1