Skip to content

Commit aa7f504

Browse files
committed
Import postfix-2.10-20121019
1 parent 02e131e commit aa7f504

31 files changed

+377
-111
lines changed

HISTORY

+46
Original file line numberDiff line numberDiff line change
@@ -18012,3 +18012,49 @@ Apologies for any names omitted.
1801218012
Bugfix: the postscreen_access_list feature was case-sensitive
1801318013
in the first character of permit, reject, etc. Reported by
1801418014
Francis Picabia. File: global/server_acl.c.
18015+
18016+
20121009
18017+
18018+
Documentation: interaction between delay_warning_time,
18019+
notify_classes and delay_notice_recipient. File:
18020+
proto/postconf.proto.
18021+
18022+
20101009
18023+
18024+
Human factors: log a warning that the postcat option -m
18025+
without -h or -b has no effect. File: postcat/postcat.c.
18026+
18027+
20121010
18028+
18029+
Bugfix (introduced: Postfix 2.5): memory leak in program
18030+
initialization. Reported by Coverity. File: tls/tls_misc.c.
18031+
18032+
Bugfix (introduced: Postfix 2.3): memory leak in the unused
18033+
oqmgr program. Reported by Coverity. File: oqmgr/qmgr_message.c.
18034+
18035+
20121011
18036+
18037+
Documentation: how to enable /etc/hosts multi-record lookups
18038+
with main.cf settings. File: proto/LINUX_README.html.
18039+
18040+
Documentation: clarified the postscreen-tlsproxy interface.
18041+
File: tlsproxy/tlsproxy.c.
18042+
18043+
20121012
18044+
18045+
Documentation: a simpler null-client example. File:
18046+
proto/STANDARD_CONFIGURATION_README.html
18047+
18048+
20120113
18049+
18050+
Cleanup: to compute the LDAP connection cache lookup key,
18051+
join the numeric fields with null, just like string fields.
18052+
Viktor Dukhovni. File: global/dict_ldap.c.
18053+
18054+
20121015
18055+
18056+
Documentation: added section on regular-expression tables
18057+
to the aliases(5) manpage. File: proto/aliases.
18058+
18059+
Documentation: why "smtp_address_preference = any" is the
18060+
preferred setting. File: proto/postconf.proto.

README_FILES/LINUX_README

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ addresses:
1616
multi on
1717
...
1818

19+
Alternatively, specify the RESOLV_MULTI environment variable in main.cf:
20+
21+
/etc/postfix/main.cf:
22+
import_environment = MAIL_CONFIG MAIL_DEBUG MAIL_LOGTAG TZ XAUTHORITY
23+
DISPLAY LANG=C RESOLV_MULTI=on
24+
1925
BBeerrkkeelleeyy DDBB iissssuueess
2026

2127
If you can't compile Postfix because the file "db.h" isn't found, then you MUST

README_FILES/STANDARD_CONFIGURATION_README

+21-15
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,38 @@ the network, and it does not deliver any mail locally. A null client typically
6363
uses POP, IMAP or NFS for mailbox access.
6464

6565
In this example we assume that the Internet domain name is "example.com" and
66-
that the machine is named "nullclient.example.com". As usual, the examples show
66+
that the machine is named "hostname.example.com". As usual, the examples show
6767
only parameters that are not left at their default settings.
6868

6969
1 /etc/postfix/main.cf:
70-
2 myorigin = $mydomain
71-
3 relayhost = $mydomain
72-
4 inet_interfaces = loopback-only
73-
5 local_transport = error:local delivery is disabled
74-
6
75-
7 /etc/postfix/master.cf:
76-
8 Comment out the local delivery agent entry
70+
2 myhostname = hostname.example.com
71+
3 myorigin = $mydomain
72+
4 relayhost = $mydomain
73+
5 inet_interfaces = loopback-only
74+
6 mydestination =
7775

7876
Translation:
7977

80-
* Line 2: Send mail as "[email protected]" (instead of
81-
"[email protected]"), so that nothing ever has a reason to send
82-
mail to "[email protected]".
78+
* Line 2: Set myhostname to hostname.example.com, in case the machine name
79+
isn't set to a fully-qualified domain name (use the command "postconf -
80+
d myhostname" to find out what the machine name is).
81+
82+
* Line 2: The myhostname value also provides the default value for the
83+
mydomain parameter (here, "mydomain = example.com").
84+
85+
* Line 3: Send mail as "[email protected]" (instead of
86+
"[email protected]"), so that nothing ever has a reason to send
87+
mail to "[email protected]".
8388

84-
* Line 3: Forward all mail to the mail server that is responsible for the
89+
* Line 4: Forward all mail to the mail server that is responsible for the
8590
"example.com" domain. This prevents mail from getting stuck on the null
8691
client if it is turned off while some remote destination is unreachable.
92+
Specify a real hostname here if your "example.com" domain has no MX record.
8793

88-
* Line 4: Do not accept mail from the network.
94+
* Line 5: Do not accept mail from the network.
8995

90-
* Lines 5-8: Disable local mail delivery. All mail goes to the mail server as
91-
specified in line 3.
96+
* Line 6: Disable local mail delivery. All mail goes to the mail server as
97+
specified in line 4.
9298

9399
PPoossttffiixx oonn aa llooccaall nneettwwoorrkk
94100

conf/aliases

+28-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,15 @@ decode: root
5656
# newaliases in order to rebuild the indexed file after
5757
# changing the Postfix alias database.
5858
#
59-
# The input and output file formats are expected to be com-
60-
# patible with Sendmail version 8, and are expected to be
61-
# suitable for the use as NIS maps.
59+
# When the table is provided via other means such as NIS,
60+
# LDAP or SQL, the same lookups are done as for ordinary
61+
# indexed files.
62+
#
63+
# Alternatively, the table can be provided as a regular-
64+
# expression map where patterns are given as regular expres-
65+
# sions. In this case, the lookups are done in a slightly
66+
# different way as described below under "REGULAR EXPRESSION
67+
# TABLES".
6268
#
6369
# Users can control delivery of their own mail by setting up
6470
# .forward files in their home directory. Lines in per-user
@@ -143,6 +149,25 @@ decode: root
143149
# The local(8) delivery agent always folds the search string
144150
# to lowercase before database lookup.
145151
#
152+
# REGULAR EXPRESSION TABLES
153+
# This section describes how the table lookups change when
154+
# the table is given in the form of regular expressions. For
155+
# a description of regular expression lookup table syntax,
156+
# see regexp_table(5) or pcre_table(5). NOTE: these formats
157+
# do not use ":" at the end of a pattern.
158+
#
159+
# Each regular expression is applied to the entire search
160+
# string. Thus, a search string user+foo is not broken up
161+
# into user and foo.
162+
#
163+
# Regular expressions are applied in the order as specified
164+
# in the table, until a regular expression is found that
165+
# matches the search string.
166+
#
167+
# Lookup results are the same as with indexed file lookups.
168+
# For security reasons there is no support for $1, $2 etc.
169+
# substring interpolation.
170+
#
146171
# SECURITY
147172
# The local(8) delivery agent disallows regular expression
148173
# substitution of $1 etc. in alias_maps, because that would

html/LINUX_README.html

+10
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ <h2> Host lookup issues </h2>
3535
</pre>
3636
</blockquote>
3737

38+
<p> Alternatively, specify the RESOLV_MULTI environment variable
39+
in <a href="postconf.5.html">main.cf</a>: </p>
40+
41+
<blockquote>
42+
<pre>
43+
/etc/postfix/<a href="postconf.5.html">main.cf</a>:
44+
<a href="postconf.5.html#import_environment">import_environment</a> = MAIL_CONFIG MAIL_DEBUG MAIL_LOGTAG TZ XAUTHORITY DISPLAY LANG=C RESOLV_MULTI=on
45+
</pre>
46+
</blockquote>
47+
3848
<h2>Berkeley DB issues</h2>
3949

4050
<p> If you can't compile Postfix because the file "db.h"

html/STANDARD_CONFIGURATION_README.html

+24-16
Original file line numberDiff line numberDiff line change
@@ -102,40 +102,48 @@ <h2><a name="null_client">Postfix on a null client</a></h2>
102102
null client typically uses POP, IMAP or NFS for mailbox access. </p>
103103

104104
<p> In this example we assume that the Internet domain name is
105-
"example.com" and that the machine is named "nullclient.example.com".
105+
"example.com" and that the machine is named "hostname.example.com".
106106
As usual, the examples show only parameters that are not left at
107107
their default settings. </p>
108108

109109
<blockquote>
110110
<pre>
111111
1 /etc/postfix/<a href="postconf.5.html">main.cf</a>:
112-
2 <a href="postconf.5.html#myorigin">myorigin</a> = $<a href="postconf.5.html#mydomain">mydomain</a>
113-
3 <a href="postconf.5.html#relayhost">relayhost</a> = $<a href="postconf.5.html#mydomain">mydomain</a>
114-
4 <a href="postconf.5.html#inet_interfaces">inet_interfaces</a> = loopback-only
115-
5 <a href="postconf.5.html#local_transport">local_transport</a> = <a href="error.8.html">error</a>:local delivery is disabled
116-
6
117-
7 /etc/postfix/<a href="master.5.html">master.cf</a>:
118-
8 Comment out the local delivery agent entry
112+
2 <a href="postconf.5.html#myhostname">myhostname</a> = hostname.example.com
113+
3 <a href="postconf.5.html#myorigin">myorigin</a> = $<a href="postconf.5.html#mydomain">mydomain</a>
114+
4 <a href="postconf.5.html#relayhost">relayhost</a> = $<a href="postconf.5.html#mydomain">mydomain</a>
115+
5 <a href="postconf.5.html#inet_interfaces">inet_interfaces</a> = loopback-only
116+
6 <a href="postconf.5.html#mydestination">mydestination</a> =
119117
</pre>
120118
</blockquote>
121119

122120
<p> Translation: </p>
123121

124122
<ul>
125123

126-
<li> <p> Line 2: Send mail as "[email protected]" (instead of
127-
"[email protected]"), so that nothing ever has a reason
128-
to send mail to "[email protected]". </p>
124+
<li> <p> Line 2: Set <a href="postconf.5.html#myhostname">myhostname</a> to hostname.example.com, in case
125+
the machine name isn't set to a fully-qualified domain name (use
126+
the command "postconf -d <a href="postconf.5.html#myhostname">myhostname</a>" to find out what the machine
127+
name is). </p>
128+
129+
<li> <p> Line 2: The <a href="postconf.5.html#myhostname">myhostname</a> value also provides the default
130+
value for the <a href="postconf.5.html#mydomain">mydomain</a> parameter (here, "<a href="postconf.5.html#mydomain">mydomain</a> = example.com").
131+
</p>
132+
133+
<li> <p> Line 3: Send mail as "[email protected]" (instead of
134+
"[email protected]"), so that nothing ever has a reason
135+
to send mail to "[email protected]". </p>
129136

130-
<li> <p> Line 3: Forward all mail to the mail server that is
137+
<li> <p> Line 4: Forward all mail to the mail server that is
131138
responsible for the "example.com" domain. This prevents mail from
132139
getting stuck on the null client if it is turned off while some
133-
remote destination is unreachable. </p>
140+
remote destination is unreachable. Specify a real hostname
141+
here if your "example.com" domain has no MX record. </p>
134142

135-
<li> <p> Line 4: Do not accept mail from the network. </p>
143+
<li> <p> Line 5: Do not accept mail from the network. </p>
136144

137-
<li> <p> Lines 5-8: Disable local mail delivery. All mail goes to
138-
the mail server as specified in line 3. </p>
145+
<li> <p> Line 6: Disable local mail delivery. All mail goes to
146+
the mail server as specified in line 4. </p>
139147

140148
</ul>
141149

html/aliases.5.html

+28-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,15 @@
2424
<b>newaliases</b> in order to rebuild the indexed file after
2525
changing the Postfix alias database.
2626

27-
The input and output file formats are expected to be com-
28-
patible with Sendmail version 8, and are expected to be
29-
suitable for the use as NIS maps.
27+
When the table is provided via other means such as NIS,
28+
LDAP or SQL, the same lookups are done as for ordinary
29+
indexed files.
30+
31+
Alternatively, the table can be provided as a regular-
32+
expression map where patterns are given as regular expres-
33+
sions. In this case, the lookups are done in a slightly
34+
different way as described below under "REGULAR EXPRESSION
35+
TABLES".
3036

3137
Users can control delivery of their own mail by setting up
3238
<b>.forward</b> files in their home directory. Lines in per-user
@@ -111,6 +117,25 @@
111117
The <a href="local.8.html">local(8)</a> delivery agent always folds the search string
112118
to lowercase before database lookup.
113119

120+
<b>REGULAR EXPRESSION TABLES</b>
121+
This section describes how the table lookups change when
122+
the table is given in the form of regular expressions. For
123+
a description of regular expression lookup table syntax,
124+
see <a href="regexp_table.5.html"><b>regexp_table</b>(5)</a> or <a href="pcre_table.5.html"><b>pcre_table</b>(5)</a>. NOTE: these formats
125+
do not use ":" at the end of a pattern.
126+
127+
Each regular expression is applied to the entire search
128+
string. Thus, a search string <i>user+foo</i> is not broken up
129+
into <i>user</i> and <i>foo</i>.
130+
131+
Regular expressions are applied in the order as specified
132+
in the table, until a regular expression is found that
133+
matches the search string.
134+
135+
Lookup results are the same as with indexed file lookups.
136+
For security reasons there is no support for <b>$1</b>, <b>$2</b> etc.
137+
substring interpolation.
138+
114139
<b>SECURITY</b>
115140
The <a href="local.8.html"><b>local</b>(8)</a> delivery agent disallows regular expression
116141
substitution of $1 etc. in <b><a href="postconf.5.html#alias_maps">alias_maps</a></b>, because that would

html/cleanup.8.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@
438438
point when logging sub-second delay values.
439439

440440
<b><a href="postconf.5.html#delay_warning_time">delay_warning_time</a> (0h)</b>
441-
The time after which the sender receives the mes-
442-
sage headers of mail that is still queued.
441+
The time after which the sender receives a copy of
442+
the message headers of mail that is still queued.
443443

444444
<b><a href="postconf.5.html#ipc_timeout">ipc_timeout</a> (3600s)</b>
445445
The time limit for sending or receiving information

html/mailq.1.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@
443443
<a href="postalias.1.html"><b>postalias</b>(1)</a> and <a href="postmap.1.html"><b>postmap</b>(1)</a> commands.
444444

445445
<b><a href="postconf.5.html#delay_warning_time">delay_warning_time</a> (0h)</b>
446-
The time after which the sender receives the mes-
447-
sage headers of mail that is still queued.
446+
The time after which the sender receives a copy of
447+
the message headers of mail that is still queued.
448448

449449
<b><a href="postconf.5.html#enable_errors_to">enable_errors_to</a> (no)</b>
450450
Report mail delivery errors to the address speci-

html/newaliases.1.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@
443443
<a href="postalias.1.html"><b>postalias</b>(1)</a> and <a href="postmap.1.html"><b>postmap</b>(1)</a> commands.
444444

445445
<b><a href="postconf.5.html#delay_warning_time">delay_warning_time</a> (0h)</b>
446-
The time after which the sender receives the mes-
447-
sage headers of mail that is still queued.
446+
The time after which the sender receives a copy of
447+
the message headers of mail that is still queued.
448448

449449
<b><a href="postconf.5.html#enable_errors_to">enable_errors_to</a> (no)</b>
450450
Report mail delivery errors to the address speci-

html/postconf.5.html

+24-4
Original file line numberDiff line numberDiff line change
@@ -2516,7 +2516,7 @@ <h2> Postfix main.cf file format </h2>
25162516
units. </p>
25172517

25182518
<p>
2519-
This feature is enabled with the <a href="postconf.5.html#delay_warning_time">delay_warning_time</a> parameter.
2519+
See also: <a href="postconf.5.html#delay_warning_time">delay_warning_time</a>, <a href="postconf.5.html#notify_classes">notify_classes</a>.
25202520
</p>
25212521

25222522

@@ -2526,8 +2526,8 @@ <h2> Postfix main.cf file format </h2>
25262526
(default: 0h)</b></DT><DD>
25272527

25282528
<p>
2529-
The time after which the sender receives the message headers of
2530-
mail that is still queued.
2529+
The time after which the sender receives a copy of the message
2530+
headers of mail that is still queued.
25312531
</p>
25322532

25332533
<p>
@@ -2541,6 +2541,10 @@ <h2> Postfix main.cf file format </h2>
25412541
The default time unit is h (hours).
25422542
</p>
25432543

2544+
<p>
2545+
See also: <a href="postconf.5.html#delay_notice_recipient">delay_notice_recipient</a>, <a href="postconf.5.html#notify_classes">notify_classes</a>.
2546+
</p>
2547+
25442548

25452549
</DD>
25462550

@@ -6734,7 +6738,8 @@ <h2> Postfix main.cf file format </h2>
67346738

67356739
<dt><b>delay</b></dt>
67366740

6737-
<dd>Send the postmaster copies of the headers of delayed mail. The
6741+
<dd>Send the postmaster copies of the headers of delayed mail (see
6742+
<a href="postconf.5.html#delay_warning_time">delay_warning_time</a>). The
67386743
notification is sent to the address specified with the
67396744
<a href="postconf.5.html#delay_notice_recipient">delay_notice_recipient</a> configuration parameter (default: postmaster).
67406745
</dd>
@@ -9209,6 +9214,21 @@ <h2> Postfix main.cf file format </h2>
92099214
unless the <a href="postconf.5.html#inet_protocols">inet_protocols</a> setting enables both IPv4 and IPv6.
92109215
With Postfix 2.8 the default is "ipv6". </p>
92119216

9217+
<p> Notes for mail delivery between sites that have both IPv4 and
9218+
IPv6 connectivity: </p>
9219+
9220+
<ul>
9221+
9222+
<li> <p> The setting "<a href="postconf.5.html#smtp_address_preference">smtp_address_preference</a> = ipv6" is unsafe.
9223+
It can fail to deliver mail when there is an outage that affects
9224+
IPv6, while the destination is still reachable over IPv4. </p>
9225+
9226+
<li> <p> The setting "<a href="postconf.5.html#smtp_address_preference">smtp_address_preference</a> = any" is safe. With
9227+
this, mail will eventually be delivered even if there is an outage
9228+
that affects IPv6 or IPv4, as long as it does not affect both. </p>
9229+
9230+
</ul>
9231+
92129232
<p> This feature is available in Postfix 2.8 and later. </p>
92139233

92149234

html/sendmail.1.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@
443443
<a href="postalias.1.html"><b>postalias</b>(1)</a> and <a href="postmap.1.html"><b>postmap</b>(1)</a> commands.
444444

445445
<b><a href="postconf.5.html#delay_warning_time">delay_warning_time</a> (0h)</b>
446-
The time after which the sender receives the mes-
447-
sage headers of mail that is still queued.
446+
The time after which the sender receives a copy of
447+
the message headers of mail that is still queued.
448448

449449
<b><a href="postconf.5.html#enable_errors_to">enable_errors_to</a> (no)</b>
450450
Report mail delivery errors to the address speci-

0 commit comments

Comments
 (0)