diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-misc/WishList | 20 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 37 |
3 files changed, 40 insertions, 21 deletions
diff --git a/doc/doc-misc/WishList b/doc/doc-misc/WishList index 7624940c4..c31891b46 100644 --- a/doc/doc-misc/WishList +++ b/doc/doc-misc/WishList @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-misc/WishList,v 1.40 2005/06/21 14:14:55 ph10 Exp $ +$Cambridge: exim/doc/doc-misc/WishList,v 1.41 2005/06/22 10:17:22 ph10 Exp $ EXIM 4 WISH LIST ---------------- @@ -864,24 +864,6 @@ So as to avoid duplication problems when sending multiple addresses in multiple copies to the same address. ------------------------------------------------------------------------------ -(73) 17-Jul-02 M Match a list from within a condition - -e.g. ${if matchdomain {$domain}{+domainlist} ... - ${if matchhost {$sender_host_address}{1.2.3.4/10:2.3.4.5/16}... - -Thought needed about how to handle host names. This may be too messy to specify -cleanly. - -22-Apr-04: Implemented for domains, addresses, and local parts. Hosts are -too messy! - -The only sensible approach seems to be to allow IP address arguments only. -Anything else should be diagnosed as an error. However, if a name appears in -the list, a PTR lookup should be done. This may require a lot of refactoring -in the code, because of the current assumption that were are (almost) always -dealing with THE sending host. ------------------------------------------------------------------------------- - (74) 22-Jul-02 M Extend -bV to do more semantic checking For example, diagnose "local_hosts" that should probably be "+local_hosts". diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 158929d03..8a9179f44 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.166 2005/06/21 14:14:55 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.167 2005/06/22 10:17:22 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -174,6 +174,8 @@ PH/22 Fixed some oversights/typos causing bugs when Exim is compiled with PH/23 Added daemon_startup_retries and daemon_startup_sleep. +PH/24 Added ${if match_ip condition. + Exim version 4.51 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 0805e0b5b..7ac53952d 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/NewStuff,v 1.51 2005/06/21 14:14:55 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/NewStuff,v 1.52 2005/06/22 10:17:22 ph10 Exp $ New Features in Exim -------------------- @@ -349,6 +349,41 @@ PH/04 There are two new options that control the retrying done by the daemon of retries after the first failure (default 9); daemon_startup_sleep defines the length of time to wait between retries (default 30s). +PH/05 There is now a new ${if condition called "match_ip". It is similar to + match_domain, etc. 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 list that can match only an IP + address, not a host name. For example: + + ${if match_ip{$sender_host_address}{1.2.3.4:5.6.7.8}{...}{...}} + + The specific types of host list item that are permitted in the list are + shown below. Consult the manual section on host lists for further + details. + + . An IP address, optionally with a CIDR mask. + + . A single asterisk matches any IP address. + + . An empty item matches only if the IP address is empty. This could be + useful for testing for a locally submitted message or one from specific + hosts in a single test such as + + ${if match_ip{$sender_host_address}{:4.3.2.1:...}{...}{...}} + + where the first item in the list is the empty string. + + . The item @[] matches any of the local host's interface addresses. + + . Lookups are assumed to be "net-" style lookups, even if "net-" is not + specified. Thus, the following are equivalent: + + ${if match_ip{$sender_host_address}{lsearch;/some/file}... + ${if match_ip{$sender_host_address}{net-lsearch;/some/file}... + + You do need to specify the "net-" prefix if you want to specify a + specific address mask, for example, by using "net24-". + Version 4.51 ------------ |