Mercurial > masqmail
comparison admin/config-transition @ 317:55b7bde95d37
reworked allowed and denied addrs for routes
The following refactorings had been made:
- allowed_mail_locals + allowed_return_paths -> allowed_senders
- not_allowed_mail_locals + not_allowed_return_paths -> denied_senders
- allowed_rcpt_domains -> allowed_recipients
- not_allowed_rcpt_domains -> denied_recipients
The new options allow more consistent and more flexible matching.
author | meillo@marmaro.de |
---|---|
date | Thu, 28 Apr 2011 09:55:06 +0200 |
parents | e230bcd0f1c6 |
children | 08932c629849 |
comparison
equal
deleted
inserted
replaced
316:d596ac8b5afb | 317:55b7bde95d37 |
---|---|
65 check["alias_local_caseless"] = "conf" SUBSEP "Renamed in 0.3.1" SUBSEP "\ | 65 check["alias_local_caseless"] = "conf" SUBSEP "Renamed in 0.3.1" SUBSEP "\ |
66 It is now called 'caseless_matching' instead. \ | 66 It is now called 'caseless_matching' instead. \ |
67 " | 67 " |
68 | 68 |
69 check["online_detect"] = "conf" SUBSEP "Removed in 0.3.2" SUBSEP "\ | 69 check["online_detect"] = "conf" SUBSEP "Removed in 0.3.2" SUBSEP "\ |
70 Destilled to online_query. \ | 70 Distilled to online_query. \ |
71 " | 71 " |
72 | 72 |
73 check["online_file"] = "conf" SUBSEP "Removed in 0.3.2" SUBSEP "\ | 73 check["online_file"] = "conf" SUBSEP "Removed in 0.3.2" SUBSEP "\ |
74 Use online_query=\"/bin/cat /path/to/file\" instead. \ | 74 Use online_query=\"/bin/cat /path/to/file\" instead. \ |
75 " | 75 " |
92 All we have is a comment in the code saying: This option is used by sqilconf. \ | 92 All we have is a comment in the code saying: This option is used by sqilconf. \ |
93 " | 93 " |
94 | 94 |
95 check["protocol"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | 95 check["protocol"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ |
96 If pipe is given, pipe will be used, otherwise smtp will be used. \ | 96 If pipe is given, pipe will be used, otherwise smtp will be used. \ |
97 " | |
98 | |
99 check["(^|[ ])allowed_return_paths"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | |
100 Replaced by 'allowed_senders'. \ | |
101 " | |
102 | |
103 check["not_allowed_return_paths"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | |
104 Replaced by 'denied_senders'. \ | |
105 " | |
106 | |
107 check["(^|[ ])allowed_mail_locals"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | |
108 Replaced by 'allowed_senders', if neither wildcards nor '@' is used. \ | |
109 " | |
110 | |
111 check["not_allowed_mail_locals"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | |
112 Replaced by 'denied_senders', if neither wildcards nor '@' is used. \ | |
113 " | |
114 | |
115 check["(^|[ ])allowed_rcpt_domains"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | |
116 Replaced by 'allowed_recipients', if the values are prepended with \ | |
117 '*@', because 'allowed_recipients' matches complete addresses not just \ | |
118 domains. \ | |
119 " | |
120 | |
121 check["not_allowed_rcpt_domains"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ | |
122 Replaced by 'denied_recipients', if the values are prepended with \ | |
123 '*@', because 'allowed_recipients' matches complete addresses not just \ | |
124 domains. \ | |
97 " | 125 " |
98 | 126 |
99 # get files | 127 # get files |
100 | 128 |
101 # already covered by the get.* and online_gets.* options in the conf | 129 # already covered by the get.* and online_gets.* options in the conf |