[exim-cvs] EXPAND_LISTMATCH_RHS for match_ip too

Gitweb: http://git.exim.org/exim.git/commitdiff/b5fd6a2b95ee5fb8106409eeada846b638bd083b

Commit:     b5fd6a2b95ee5fb8106409eeada846b638bd083b
Parent:     f82a3c9b085560c97e17a796e01b73f1accfd24e
Author:     Phil Pennock <pdp@???>
AuthorDate: Fri Oct 14 10:03:02 2011 -0400
Committer:  Phil Pennock <pdp@???>
CommitDate: Fri Oct 14 10:03:02 2011 -0400

    EXPAND_LISTMATCH_RHS for match_ip too
---
 doc/doc-docbook/spec.xfpt |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index de7d2b6..f8e7383 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -10208,10 +10208,12 @@ See &*match_local_part*&.

.vitem &*match_ip&~{*&<&'string1'&>&*}{*&<&'string2'&>&*}*&
.cindex "&%match_ip%& expansion condition"
+.new
This condition matches an IP address to a list of IP address patterns. It must
be followed by two argument strings. The first (after expansion) must be an IP
-address or an empty string. The second (after expansion) is a restricted host
+address or an empty string. The second (not expanded) is a restricted host
list that can match only an IP address, not a host name. For example:
+.wen
.code
${if match_ip{$sender_host_address}{1.2.3.4:5.6.7.8}{...}{...}}
.endd
@@ -10257,6 +10259,11 @@ just as easy to use the fact that a lookup is itself a condition, and write:
.endd
.endlist ilist

+.new
+Note that <&'string2'&> is not itself subject to string expansion, unless
+Exim was built with the EXPAND_LISTMATCH_RHS option.
+.wen
+
Consult section &<<SECThoslispatip>>& for further details of these patterns.

.vitem &*match_local_part&~{*&<&'string1'&>&*}{*&<&'string2'&>&*}*&