1.1 --- a/man/masqmail.route.5	Mon Apr 25 15:17:30 2011 +0200
     1.2 +++ b/man/masqmail.route.5	Thu Apr 28 09:55:06 2011 +0200
     1.3 @@ -17,62 +17,65 @@
     1.4  .SH ROUTE CONDITIONS
     1.5  
     1.6  .TP
     1.7 -\fBallowed_mail_locals\fR = \fIlist\fR
     1.8 +\fBallowed_senders\fR = \fIlist\fR
     1.9  
    1.10 -This is a semicolon `;' separated list of local parts of envelope
    1.11 -senders (= mail from = return path) which will be allowed
    1.12 -to send mail through this connection.
    1.13 -If unset and \fBnot_allowed_mail_locals\fR is also unset, all users are allowed.
    1.14 +This is a semicolon `;' separated list of envelope sender addresses.
    1.15 +Messages which have one of these addresses as the return path (= mail
    1.16 +from) are allowed to use this route
    1.17 +(if not also in \fBdenied_senders\fR).
    1.18 +
    1.19 +Glob patterns containing `?' and `*' can be used.
    1.20 +The special item "<>" matches the null sender address
    1.21 +(eg. failure notices or delivery notifications).
    1.22 +If the pattern doesn't contain an `@', it is seen as a pattern for the
    1.23 +local part only.
    1.24 +
    1.25 +Example: \fImeillo;*@*example.org;web*@example.com\fP
    1.26 +
    1.27 +(``meillo'' equals ``meillo@*'', i.e. the local part.)
    1.28  
    1.29  .TP
    1.30 -\fBnot_allowed_mail_locals\fR = \fIlist\fR
    1.31 +\fBdenied_senders\fR = \fIlist\fR
    1.32  
    1.33 -This is a semicolon `;' separated list of local parts of envelope
    1.34 -senders (= mail from = return path) which will be not allowed
    1.35 -to send mail through this connection.
    1.36 -Local parts in this list will not be allowed to use this route even if they
    1.37 -are part of \fBallowed_mail_locals\fR (see above).
    1.38 +This is a semicolon `;' separated list of envelope sender addresses.
    1.39 +Messages which have one of these addresses as the return path (=
    1.40 +mail from) will not
    1.41 +be sent using this route (even if also in \fBallowed_senders\fR).
    1.42 +
    1.43 +Glob patterns containing `?' and `*' can be used.
    1.44 +The special item "<>" matches the null sender address
    1.45 +(eg. failure notices or delivery notifications).
    1.46 +If the pattern doesn't contain an `@', it is seen as a pattern for the
    1.47 +local part only.
    1.48 +
    1.49 +Example: (see \fIallowed_senders\fP)
    1.50  
    1.51  .TP
    1.52 -\fBallowed_return_paths\fR = \fIlist\fR
    1.53 +\fBallowed_recipients\fR = \fIlist\fR
    1.54  
    1.55 -This is a semicolon `;' separated list of addresses.
    1.56 -Messages which have one of these addresses as the return path (=
    1.57 -envelope sender = mail from) will be used using this route
    1.58 -(if not also in \fBnot_allowed_return_paths\fR or an item in \fBnot_allowed_mail_locals\fR matches).
    1.59 +A list of envelope recipient addresses where mail can be sent to using
    1.60 +this route.
    1.61 +This is for example useful if you use this route configuration when connected to another LAN via ppp.
    1.62 +Glob patterns containing `?' and `*' can be used.
    1.63  
    1.64 -Patterns containing `?' and `*' can be used.
    1.65 -The special item "<>" matches the null sender address (eg. failure notices or delivery notifications).
    1.66 +Example: \fI*@example.org;*@*foo.bar\fP
    1.67 +
    1.68 +(See also examples for \fIallowed_senders\fP)
    1.69  
    1.70  .TP
    1.71 -\fBnot_allowed_return_paths\fR = \fIlist\fR
    1.72 +\fBdenied_recipients\fR = \fIlist\fR
    1.73  
    1.74 -This is a semicolon `;' separated list of addresses.
    1.75 -Messages which have one of these addresses as the return path (=
    1.76 -envelope sender = mail from) will not
    1.77 -be used using this route (even if also in \fBallowed_return_paths\fR
    1.78 -or an item in \fBallowed_mail_locals\fR matches).
    1.79 -
    1.80 -Patterns containing `?' and `*' can be used.
    1.81 -The special item "<>" matches the null sender address (eg. failure notices or delivery notifications).
    1.82 -
    1.83 -.TP
    1.84 -\fBallowed_rcpt_domains\fR = \fIlist\fR
    1.85 -
    1.86 -A list of recipient domains (of envelope recipients) where mail will be sent to.
    1.87 -This is for example useful if you use this route configuration when connected to another LAN via ppp.
    1.88 -Patterns containing `?' and `*' can be used.
    1.89 -
    1.90 -.TP
    1.91 -\fBnot_allowed_rcpt_domains\fR = \fIlist\fR
    1.92 -
    1.93 -A list of recipient domains (of envelope recipients) where mail will not be sent to.
    1.94 +A list of envelope recipient addresses where mail will not be sent to
    1.95 +using this route.
    1.96  This is for example useful if you send mail directly (\fBmail_host\fR is not set)
    1.97  and you know of hosts that will not accept mail from you because they use a dialup list
    1.98  (eg. \fBhttp://maps.vix.com/dul/\fR).
    1.99 -If any domain matches both \fBallowed_rcpt_domains\fR and \fBnot_allowed_rcpt_domains\fR,
   1.100 -mail will not be sent to this domain.
   1.101 -Patterns containing `?' and `*' can be used.
   1.102 +\fBdenied_recipients\fR overrules \fBallowed_recipients\fR.
   1.103 +Glob patterns containing `?' and `*' can be used.
   1.104 +
   1.105 +Example: \fI*@spamblocker.example.org\fP
   1.106 +
   1.107 +(See also examples for \fIallowed_senders\fP)
   1.108  
   1.109  .TP
   1.110  \fBlast_route\fR = \fIboolean\fR
   1.111 @@ -80,8 +83,9 @@
   1.112  If this is set, a mail which would have been delivered using this route,
   1.113  but has failed temporarily, will not be tried to be delivered using the next route.
   1.114  
   1.115 -If you have set up a special route with filters using the lists `allowed_rcpt_domains',
   1.116 -`allowed_return_paths', and `allowed_mail_locals' or their complements (not_),
   1.117 +If you have set up a special route with filters using the lists
   1.118 +`allowed_recipients' and `allowed_senders' or their complements
   1.119 +(denied_),
   1.120  and the mail passing these rules should be delivered using this route only,
   1.121  you should set this to `true'.
   1.122  Otherwise the mail would be passed to the next route (if any),