mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-09-01 14:45:32 +00:00
Code Issues Releases Wiki Activity

postfix-3.1-20160214

Browse Source
This commit is contained in:
Wietse Venema
2016-02-14 00:00:00 -05:00
committed by Viktor Dukhovni
parent 6cd4b2aa33
commit 70f66a4b6a
35 changed files with 538 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
postfix/HISTORY
View File

@@ -22173,4 +22173,8 @@ Apologies for any names omitted.
20160213
Google credits in manpages.
Added Google credits to external manpages.
20160214
More manpage cleanups. Viktor, Wietse.

67
postfix/RELEASE_NOTES
View File

@@ -29,21 +29,47 @@ description.
Major changes with snaphot 20151227
===================================
This introduces a safety limit on the number of address verification
probes in the active queue (address_verify_pending_request_limit),
by default 1/4 of the active queue maximum size. The queue manager
enforces the limit by tempfailing probe messages that exceed the
limit. The design avoids dependency on global counters that may get
out of sync after process crash.
The new address_verify_pending_request_limit parameter introduces
a safety limit for the number of address verification probes in the
active queue. The default limit is 1/4 of the active queue maximum
size. The queue manager enforces the limit by tempfailing probe
messages that exceed the limit. This design avoids dependencies on
global counters that get out of sync after a process or system crash.
Tempfailing requests in this manner is not as bad as one might
think. The Postfix verify cache proactively updates active addresses
well before they expire. The address_verify_pending_request_limit
affects only unknown addresses and inactive addresses that have
expired from the address verify cache (by default, after 31 days).
Tempfailing verify requests is not as bad as one might think. The
Postfix verify cache proactively updates active addresses weeks
before they expire. The address_verify_pending_request_limit affects
only unknown addresses, and inactive addresses that have expired
from the address verify cache (by default, after 31 days).
Major changes with snaphot 20151129
===================================
Machine-readable, JSON-formatted queue listing with "postqueue -j"
(no "mailq" equivalent). The output is a stream of JSON objects,
one per queue file. To simplify parsing, each JSON object is
formatted as one text line followed by one newline character. See
the postqueue(1) manpage for a detailed description of the output
format.
Major changes with Postfix snapshot 20151031
============================================
New "smtpd_client_auth_rate_limit" feature, to enforce an optional
rate limit on the number of AUTH commands per client IP address.
Similar to other smtpd_client_*rate_limit features, this enforces
a limit on the number of requests per $anvil_rate_time_unit.
Major changes with Postfix snapshot 20150913
============================================
New SMTPD policy service attribute "policy_context", with a
corresponding "smtpd_policy_service_policy_context" configuration
parameter. Originally, this was implemented to share the same SMTPD
policy service endpoint among multiple check_policy_service clients.
Incompatible change with Postfix snapshot 20150721
--------------------------------------------------
==================================================
As of the middle of 2015, all supported Postfix releases no longer
enable "export" grade ciphers for opportunistic TLS, and no longer
@@ -118,7 +144,7 @@ Destination-independent delivery rate delay
Support to enforce a destination-independent delay between email
deliveries. The following example inserts 20 seconds of delay
between deliveries with the SMTP transport, limiting the delivery
between all deliveries with the SMTP transport, limiting the delivery
rate to at most three messages per minute.
/etc/postfix/main.cf:
@@ -126,3 +152,18 @@ rate to at most three messages per minute.
For details, see the description of default_transport_rate_delay
and transport_transport_rate_delay in the postconf(5) manpage.
Major changes with snaphot 20150523
===================================
The milter_macro_defaults feature provides an optional list of macro
name=value pairs. These specify default values for Milter macros
when no value is available from the SMTP session context.
For example, with "milter_macro_defaults = auth_type=TLS", the
Postfix SMTP server will send an auth_type of "TLS" to a Milter,
unless the remote client authenticates with SASL.
This feature was originally implemented for a submission service
that may authenticate clients with a TLS certificate, without having
to make changes to the code that implements TLS support.

5
postfix/WISHLIST
View File

@@ -6,11 +6,6 @@ Wish list:
Disable -DSNAPSHOT and -DNONPROD in makedefs.
Add "postfix tls" and other new stuff to RELEASE_NOTES.
Fix bold "[" and "]" in manpages; these are not part of the
command line.
Remove this file from the stable release.
Things to do after the stable release:

2
postfix/html/oqmgr.8.html
View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title> Postfix manual - oqmgr(8) </title>
</head> <body> <pre>
OQMGR(8) System Manager's Manual OQMGR(8)
OQMGR(8) OQMGR(8)
<b>NAME</b>
oqmgr - old Postfix queue manager

13
postfix/html/postconf.1.html
View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title> Postfix manual - postconf(1) </title>
</head> <body> <pre>
POSTCONF(1) General Commands Manual POSTCONF(1)
POSTCONF(1) POSTCONF(1)
<b>NAME</b>
postconf - Postfix configuration utility
@@ -52,7 +52,7 @@ POSTCONF(1) General Commands Manual POSTCONF(1)
<b>Managing TLS features:</b>
<b>postconf</b> [<b>-v</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>] <b>-T</b> <i>mode</i>
<b>postconf -T</b> <i>mode</i> [<b>-v</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>]
<b>Managing other configuration:</b>
@@ -167,8 +167,8 @@ POSTCONF(1) General Commands Manual POSTCONF(1)
This feature is available with Postfix 2.9 and later.
<b>-F</b> Show <a href="master.5.html"><b>master.cf</b></a> per-entry field settings (by default all services
and all fields), formatted as one "<i>service/type/field=value</i>" per
line. Specify <b>-Ff</b> to fold long lines.
and all fields), formatted as "<i>service/type/field=value</i>", one
per line. Specify <b>-Ff</b> to fold long lines.
Specify one or more "<i>service/type/field</i>" instances on the <a href="postconf.1.html"><b>post-</b></a>
<a href="postconf.1.html"><b>conf</b>(1)</a> command line to limit the output to fields of interest.
@@ -380,9 +380,8 @@ POSTCONF(1) General Commands Manual POSTCONF(1)
This feature is available with Postfix 2.11 and later.
<b>-P</b> Show <a href="master.5.html"><b>master.cf</b></a> service parameter settings (by default all ser-
vices and all parameters). formatted as one "<i>ser-</i>
<i>vice/type/parameter=value</i>" per line. Specify <b>-Pf</b> to fold long
lines.
vices and all parameters), formatted as "<i>service/type/parame-</i>
<i>ter=value</i>", one per line. Specify <b>-Pf</b> to fold long lines.
Specify one or more "<i>service/type/parameter</i>" instances on the
<a href="postconf.1.html"><b>postconf</b>(1)</a> command line to limit the output to parameters of

2
postfix/html/postfix.1.html
View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title> Postfix manual - postfix(1) </title>
</head> <body> <pre>
POSTFIX(1) General Commands Manual POSTFIX(1)
POSTFIX(1) POSTFIX(1)
<b>NAME</b>
postfix - Postfix control program

6
postfix/html/postmulti.1.html
View File

@@ -10,11 +10,11 @@ POSTMULTI(1) POSTMULTI(1)
postmulti - Postfix multi-instance manager
<b>SYNOPSIS</b>
<b>ENABLING MULTI-INSTANCE MANAGEMENT:</b>
<b>Enabling multi-instance management:</b>
<b>postmulti -e init</b> [<b>-v</b>]
<b>ITERATOR MODE:</b>
<b>Iterator mode:</b>
<b>postmulti -l</b> [<b>-aRv</b>] [<b>-g</b> <i>group</i>] [<b>-i</b> <i>name</i>]
@@ -22,7 +22,7 @@ POSTMULTI(1) POSTMULTI(1)
<b>postmulti -x</b> [<b>-aRv</b>] [<b>-g</b> <i>group</i>] [<b>-i</b> <i>name</i>] <i>command...</i>
<b>LIFE-CYCLE MANAGEMENT:</b>
<b>Life-cycle management:</b>
<b>postmulti -e create</b> [<b>-av</b>] [<b>-g</b> <i>group</i>] [<b>-i</b> <i>name</i>] [<b>-G</b> <i>group</i>] [<b>-I</b> <i>name</i>]
[<i>param=value</i> ...]

88
postfix/html/postqueue.1.html
View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title> Postfix manual - postqueue(1) </title>
</head> <body> <pre>
POSTQUEUE(1) General Commands Manual POSTQUEUE(1)
POSTQUEUE(1) POSTQUEUE(1)
<b>NAME</b>
postqueue - Postfix queue control
@@ -58,45 +58,8 @@ POSTQUEUE(1) General Commands Manual POSTQUEUE(1)
<b>-j</b> Produce a queue listing in JSON format, based on output from the
<a href="showq.8.html">showq(8)</a> daemon. The result is a stream of zero or more JSON
objects, one per queue file. Each object is followed by a new-
line character to support simple streaming parsers.
Object members have string values unless indicated otherwise.
Programs should ignore object members that are not listed here;
the list of members is expected to grow over time.
<b>queue_name</b>
The name of the queue where the message was found. Note
that the contents of the mail queue may change while it
is being listed; some messages may appear more than once,
and some messages may be missed.
<b>queue_id</b>
The queue file name. The name may be reused unless
"<a href="postconf.5.html#enable_long_queue_ids">enable_long_queue_ids</a> = true".
<b>arrival_time</b>
The number of seconds since the start of the UNIX epoch.
<b>message_size</b>
The number of bytes in the message header and body. This
number does not include message envelope information. It
is approximately equal to the number of bytes that would
be transmitted via SMTP including the &lt;CR&gt;&lt;LF&gt; line end-
ings.
<b>sender</b> The envelope sender address.
<b>recipients</b>
An array containing zero or more objects with members:
<b>address</b>
One recipient address.
<b>delay_reason</b>
If present, the reason for delayed delivery. Some
delayed recipients have no delay reason, for exam-
ple, when delivery is in progress or when the sys-
tem was stopped before it could record the reason.
line character to support simple streaming parsers. See "<b>JSON</b>
<b>OBJECT FORMAT</b>" below for details.
This feature is available in Postfix 3.1 and later.
@@ -132,6 +95,51 @@ POSTQUEUE(1) General Commands Manual POSTQUEUE(1)
options make the software increasingly verbose. As of Postfix
2.3, this option is available for the super-user only.
<b>JSON OBJECT FORMAT</b>
Each JSON object represents one queue file; it is emitted as a single
text line followed by a newline character.
Object members have string values unless indicated otherwise. Programs
should ignore object members that are not listed here; the list of mem-
bers is expected to grow over time.
<b>queue_name</b>
The name of the queue where the message was found. Note that
the contents of the mail queue may change while it is being
listed; some messages may appear more than once, and some mes-
sages may be missed.
<b>queue_id</b>
The queue file name. The queue_id may be reused within a Postfix
instance unless "<a href="postconf.5.html#enable_long_queue_ids">enable_long_queue_ids</a> = true" and time is mono-
tonic. Even then, the queue_id is not expected to be unique
between different Postfix instances. Management tools that
require a unique name should combine the queue_id with the
<a href="postconf.5.html#myhostname">myhostname</a> setting of the Postfix instance.
<b>arrival_time</b>
The number of seconds since the start of the UNIX epoch.
<b>message_size</b>
The number of bytes in the message header and body. This number
does not include message envelope information. It is approxi-
mately equal to the number of bytes that would be transmitted
via SMTP including the &lt;CR&gt;&lt;LF&gt; line endings.
<b>sender</b> The envelope sender address.
<b>recipients</b>
An array containing zero or more objects with members:
<b>address</b>
One recipient address.
<b>delay_reason</b>
If present, the reason for delayed delivery. Delayed
recipients may have no delay reason, for example, while
delivery is in progress, or after the system was stopped
before it could record the reason.
<b>SECURITY</b>
This program is designed to run with set-group ID privileges, so that
it can connect to Postfix daemon processes.

2
postfix/html/qmgr.8.html
View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title> Postfix manual - qmgr(8) </title>
</head> <body> <pre>
QMGR(8) System Manager's Manual QMGR(8)
QMGR(8) QMGR(8)
<b>NAME</b>
qmgr - Postfix queue manager

19
postfix/man/man1/postconf.1
View File

@@ -9,6 +9,7 @@ Postfix configuration utility
.na
.nf
.fi
.ti -4
\fBManaging main.cf:\fR
\fBpostconf\fR [\fB\-dfhHnopvx\fR] [\fB\-c \fIconfig_dir\fR]
@@ -23,6 +24,7 @@ Postfix configuration utility
\fBpostconf\fR \fB\-X\fR [\fB\-pv\fR] [\fB\-c \fIconfig_dir\fR]
\fIparameter ...\fR
.ti -4
\fBManaging master.cf service entries:\fR
\fBpostconf\fR \fB\-M\fR [\fB\-fovx\fR] [\fB\-c \fIconfig_dir\fR]
@@ -37,6 +39,7 @@ Postfix configuration utility
\fBpostconf\fR \fB\-MX\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR]
\fIservice\fB/\fItype ...\fR
.ti -4
\fBManaging master.cf service fields:\fR
\fBpostconf\fR \fB\-F\fR [\fB\-fhHovx\fR] [\fB\-c \fIconfig_dir\fR]
@@ -45,6 +48,7 @@ Postfix configuration utility
\fBpostconf\fR \fB\-F\fR [\fB\-ev\fR] [\fB\-c \fIconfig_dir\fR]
\fIservice\fB/\fItype\fB/\fIfield\fB=\fIvalue ...\fR
.ti -4
\fBManaging master.cf service parameters:\fR
\fBpostconf\fR \fB\-P\fR [\fB\-fhHovx\fR] [\fB\-c \fIconfig_dir\fR]
@@ -56,6 +60,7 @@ Postfix configuration utility
\fBpostconf\fR \fB\-PX\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR]
\fIservice\fB/\fItype\fB/\fIparameter ...\fR
.ti -4
\fBManaging bounce message templates:\fR
\fBpostconf\fR \fB\-b\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR]
@@ -64,10 +69,12 @@ Postfix configuration utility
\fBpostconf\fR \fB\-t\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR]
[\fItemplate_file\fR]
.ti -4
\fBManaging TLS features:\fR
\fBpostconf\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR] \fB\-T \fImode\fR
\fBpostconf\fR \fB\-T \fImode\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR]
.ti -4
\fBManaging other configuration:\fR
\fBpostconf\fR \fB\-a\fR|\fB\-A\fR|\fB\-l\fR|\fB\-m\fR [\fB\-v\fR]
@@ -193,9 +200,9 @@ configuration file entries, for human readability.
This feature is available with Postfix 2.9 and later.
.IP \fB\-F\fR
Show \fBmaster.cf\fR per\-entry field settings (by default
all services and all fields), formatted as one
"\fIservice/type/field=value\fR" per line. Specify \fB\-Ff\fR
to fold long lines.
all services and all fields), formatted as
"\fIservice/type/field=value\fR", one per line. Specify
\fB\-Ff\fR to fold long lines.
Specify one or more "\fIservice/type/field\fR" instances
on the \fBpostconf\fR(1) command line to limit the output
@@ -395,8 +402,8 @@ Show \fBmain.cf\fR parameter settings. This is the default.
This feature is available with Postfix 2.11 and later.
.IP \fB\-P\fR
Show \fBmaster.cf\fR service parameter settings (by default
all services and all parameters). formatted as one
"\fIservice/type/parameter=value\fR" per line. Specify
all services and all parameters), formatted as
"\fIservice/type/parameter=value\fR", one per line. Specify
\fB\-Pf\fR to fold long lines.
Specify one or more "\fIservice/type/parameter\fR" instances

6
postfix/man/man1/postfix.1
View File

@@ -60,7 +60,7 @@ Re\-read configuration files. Running processes terminate at their
earliest convenience.
.IP \fBstatus\fR
Indicate if the Postfix mail system is currently running.
.IP "\fBset\-permissions\fR [\fIname\fR=\fIvalue ...\fR]
.IP "\fBset\-permissions\fR [\fIname\fR=\fIvalue ...\fR]"
Set the ownership and permissions of Postfix related files and
directories, as specified in the \fBpostfix\-files\fR file.
.sp
@@ -72,13 +72,13 @@ already installed Postfix system.
This feature is available in Postfix 2.1 and later. With
Postfix 2.0 and earlier, use "\fB$config_directory/post\-install
set\-permissions\fR".
.IP "\fBtls\fR \fIsubcommand\fR
.IP "\fBtls\fR \fIsubcommand\fR"
Enable opportunistic TLS in the Postfix SMTP client or
server, and manage Postfix SMTP server TLS private keys and
certificates. See postfix\-tls(1) for documentation.
.sp
This feature is available in Postfix 3.1 and later.
.IP "\fBupgrade\-configuration\fR [\fIname\fR=\fIvalue ...\fR]
.IP "\fBupgrade\-configuration\fR [\fIname\fR=\fIvalue ...\fR]"
Update the \fBmain.cf\fR and \fBmaster.cf\fR files with information
that Postfix needs in order to run: add or update services, and add
or update configuration parameter settings.

15
postfix/man/man1/postmulti.1
View File

@@ -9,11 +9,13 @@ Postfix multi\-instance manager
.na
.nf
.fi
\fBENABLING MULTI\-INSTANCE MANAGEMENT:\fR
.ti -4
\fBEnabling multi\-instance management:\fR
\fBpostmulti\fR \fB\-e init\fR [\fB\-v\fR]
\fBITERATOR MODE:\fR
.ti -4
\fBIterator mode:\fR
\fBpostmulti\fR \fB\-l\fR [\fB\-aRv\fR] [\fB\-g \fIgroup\fR]
[\fB\-i \fIname\fR]
@@ -24,7 +26,8 @@ Postfix multi\-instance manager
\fBpostmulti\fR \fB\-x\fR [\fB\-aRv\fR] [\fB\-g \fIgroup\fR]
[\fB\-i \fIname\fR] \fIcommand...\fR
\fBLIFE\-CYCLE MANAGEMENT:\fR
.ti -4
\fBLife\-cycle management:\fR
\fBpostmulti\fR \fB\-e create\fR [\fB\-av\fR]
[\fB\-g \fIgroup\fR] [\fB\-i \fIname\fR] [\fB\-G \fIgroup\fR]
@@ -400,9 +403,9 @@ html_directory\fR" to locate this information.
.nf
.na
MULTI_INSTANCE_README, Postfix multi\-instance management
.SH "HISTORY"
.na
.nf
.SH HISTORY
.ad
.fi
.ad
.fi
The \fBpostmulti\fR(1) command was introduced with Postfix

83
postfix/man/man1/postqueue.1
View File

@@ -8,6 +8,7 @@ Postfix queue control
.SH "SYNOPSIS"
.na
.nf
.ti -4
\fBTo flush the mail queue\fR:
\fBpostqueue\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR] \fB\-f\fR
@@ -16,6 +17,7 @@ Postfix queue control
\fBpostqueue\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR] \fB\-s \fIsite\fR
.ti -4
\fBTo list the mail queue\fR:
\fBpostqueue\fR [\fB\-v\fR] [\fB\-c \fIconfig_dir\fR] \fB\-j\fR
@@ -57,42 +59,8 @@ Produce a queue listing in JSON format, based on output
from the showq(8) daemon. The result is a stream of zero
or more JSON objects, one per queue file. Each object is
followed by a newline character to support simple streaming
parsers.
.sp
Object members have string values unless indicated otherwise.
Programs should ignore object members that are not listed
here; the list of members is expected to grow over time.
.RS
.IP \fBqueue_name\fR
The name of the queue where the message was found. Note
that the contents of the mail queue may change while it is
being listed; some messages may appear more than once, and
some messages may be missed.
.IP \fBqueue_id\fR
The queue file name. The name may be reused unless
"enable_long_queue_ids = true".
.IP \fBarrival_time\fR
The number of seconds since the start of the UNIX epoch.
.IP \fBmessage_size\fR
The number of bytes in the message header and body. This
number does not include message envelope information. It
is approximately equal to the number of bytes that would
be transmitted via SMTP including the <CR><LF> line endings.
.IP \fBsender\fR
The envelope sender address.
.IP \fBrecipients\fR
An array containing zero or more objects with members:
.RS
.IP \fBaddress\fR
One recipient address.
.IP \fBdelay_reason\fR
If present, the reason for delayed delivery. Some delayed
recipients have no delay reason, for example, when delivery
is in progress or when the system was stopped before it
could record the reason.
.RE
.RE
.IP
parsers. See "\fBJSON OBJECT FORMAT\fR" below for details.
This feature is available in Postfix 3.1 and later.
.IP \fB\-p\fR
Produce a traditional sendmail\-style queue listing.
@@ -126,6 +94,49 @@ command, by contacting the Postfix \fBflush\fR(8) daemon.
Enable verbose logging for debugging purposes. Multiple \fB\-v\fR
options make the software increasingly verbose. As of Postfix 2.3,
this option is available for the super\-user only.
.SH "JSON OBJECT FORMAT"
.na
.nf
.ad
.fi
Each JSON object represents one queue file; it is emitted
as a single text line followed by a newline character.
Object members have string values unless indicated otherwise.
Programs should ignore object members that are not listed
here; the list of members is expected to grow over time.
.IP \fBqueue_name\fR
The name of the queue where the message was found. Note
that the contents of the mail queue may change while it is
being listed; some messages may appear more than once, and
some messages may be missed.
.IP \fBqueue_id\fR
The queue file name. The queue_id may be reused within a
Postfix instance unless "enable_long_queue_ids = true" and
time is monotonic. Even then, the queue_id is not expected
to be unique between different Postfix instances. Management
tools that require a unique name should combine the queue_id
with the myhostname setting of the Postfix instance.
.IP \fBarrival_time\fR
The number of seconds since the start of the UNIX epoch.
.IP \fBmessage_size\fR
The number of bytes in the message header and body. This
number does not include message envelope information. It
is approximately equal to the number of bytes that would
be transmitted via SMTP including the <CR><LF> line endings.
.IP \fBsender\fR
The envelope sender address.
.IP \fBrecipients\fR
An array containing zero or more objects with members:
.RS
.IP \fBaddress\fR
One recipient address.
.IP \fBdelay_reason\fR
If present, the reason for delayed delivery. Delayed
recipients may have no delay reason, for example, while
delivery is in progress, or after the system was stopped
before it could record the reason.
.RE
.SH "SECURITY"
.na
.nf

2
postfix/man/man1/qmqp-sink.1
View File

@@ -42,7 +42,7 @@ is completed.
.IP \fB\-v\fR
Increase verbosity. Specify \fB\-v \-v\fR to see some of the QMQP
conversation.
.IP "\fB\-x \fItime\fR
.IP "\fB\-x \fItime\fR"
Terminate after \fItime\fR seconds. This is to facilitate memory
leak testing.
.SH "SEE ALSO"

2
postfix/man/man1/sendmail.1
View File

@@ -116,7 +116,7 @@ versions before 2.3.
With all Postfix versions, you can specify a directory pathname
with the MAIL_CONFIG environment variable to override the
location of configuration files.
.IP "\fB\-F \fIfull_name\fR
.IP "\fB\-F \fIfull_name\fR"
Set the sender full name. This overrides the NAME environment
variable, and is used only with messages that
have no \fBFrom:\fR message header.

2
postfix/man/man8/oqmgr.8
View File

@@ -85,7 +85,7 @@ of new mail.
.IP "\fBslow start\fR"
This strategy eliminates "thundering herd" problems by slowly
adjusting the number of parallel deliveries to the same destination.
.IP "\fBround robin\fR
.IP "\fBround robin\fR"
The queue manager sorts delivery requests by destination.
Round\-robin selection prevents one destination from dominating
deliveries to other destinations.

2
postfix/man/man8/qmgr.8
View File

@@ -85,7 +85,7 @@ of new mail.
.IP "\fBslow start\fR"
This strategy eliminates "thundering herd" problems by slowly
adjusting the number of parallel deliveries to the same destination.
.IP "\fBround robin\fR
.IP "\fBround robin\fR"
The queue manager sorts delivery requests by destination.
Round\-robin selection prevents one destination from dominating
deliveries to other destinations.

6
postfix/src/global/attr_override.c
View File

@@ -32,16 +32,16 @@
/* with arguments. Each macro may appear only once. The list
/* must be terminated with CA_ATTR_OVER_END which has no argument.
/* The following describes the expected values.
/* .IP "CA_ATTR_OVER_STR_TABLE(const ATTR_OVER_STR *)
/* .IP "CA_ATTR_OVER_STR_TABLE(const ATTR_OVER_STR *)"
/* The macro argument specifies a null-terminated table with
/* attribute names, assignment targets, and range limits which
/* should be the same as for the corresponding main.cf parameters.
/* .IP "CA_ATTR_OVER_TIME_TABLE(const ATTR_OVER_TIME *)
/* .IP "CA_ATTR_OVER_TIME_TABLE(const ATTR_OVER_TIME *)"
/* The macro argument specifies a null-terminated table with
/* attribute names, their default time units (leading digits
/* are skipped), assignment targets, and range limits which
/* should be the same as for the corresponding main.cf parameters.
/* .IP "CA_ATTR_OVER_INT_TABLE(const ATTR_OVER_INT *)
/* .IP "CA_ATTR_OVER_INT_TABLE(const ATTR_OVER_INT *)"
/* The macro argument specifies a null-terminated table with
/* attribute names, assignment targets, and range limits which
/* should be the same as for the corresponding main.cf parameters.

4
postfix/src/global/ext_prop.c
View File

@@ -19,10 +19,10 @@
/* .IP "canonical (EXT_PROP_CANONICAL)"
/* Propagate unmatched address extensions to the right-hand side
/* of canonical table entries (not: regular expressions).
/* .IP "virtual (EXT_PROP_VIRTUAL)
/* .IP "virtual (EXT_PROP_VIRTUAL)"
/* Propagate unmatched address extensions to the right-hand side
/* of virtual table entries (not: regular expressions).
/* .IP "alias (EXT_PROP_ALIAS)
/* .IP "alias (EXT_PROP_ALIAS)"
/* Propagate unmatched address extensions to the right-hand side
/* of alias database entries.
/* .IP "forward (EXT_PROP_FORWARD)"

2
postfix/src/global/mail_version.h
View File

@@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
#define MAIL_RELEASE_DATE "20160213"
#define MAIL_RELEASE_DATE "20160214"
#define MAIL_VERSION_NUMBER "3.1"
#ifdef SNAPSHOT

2
postfix/src/master/event_server.c
View File

@@ -122,7 +122,7 @@
/* by the event_server_disconnect() function (see below).
/* .sp
/* Only the last instance of this parameter type is remembered.
/* .IP "CA_MAIL_SERVER_IN_FLOW_DELAY
/* .IP CA_MAIL_SERVER_IN_FLOW_DELAY
/* Pause $in_flow_delay seconds when no "mail flow control token"
/* is available. A token is consumed for each connection request.
/* .IP CA_MAIL_SERVER_SOLITARY

2
postfix/src/master/multi_server.c
View File

@@ -119,7 +119,7 @@
/* by the multi_server_disconnect() function (see below).
/* .sp
/* Only the last instance of this parameter type is remembered.
/* .IP "CA_MAIL_SERVER_IN_FLOW_DELAY
/* .IP CA_MAIL_SERVER_IN_FLOW_DELAY
/* Pause $in_flow_delay seconds when no "mail flow control token"
/* is available. A token is consumed for each connection request.
/* .IP CA_MAIL_SERVER_SOLITARY

2
postfix/src/milter/test-milter.c
View File

@@ -34,7 +34,7 @@
/* .IP "\fB-D\fI address\fR"
/* Delete the specified recipient address. Multiple -D options
/* are supported.
/* .IP "\fB-f \fIsender\fR
/* .IP "\fB-f \fIsender\fR"
/* Replace the sender by the specified address.
/* .IP "\fB-h \fI'index header-label header-value'\fR"
/* Replace the message header at the specified position.

2
postfix/src/oqmgr/qmgr.c
View File

@@ -73,7 +73,7 @@
/* .IP "\fBslow start\fR"
/* This strategy eliminates "thundering herd" problems by slowly
/* adjusting the number of parallel deliveries to the same destination.
/* .IP "\fBround robin\fR
/* .IP "\fBround robin\fR"
/* The queue manager sorts delivery requests by destination.
/* Round-robin selection prevents one destination from dominating
/* deliveries to other destinations.

19
postfix/src/postconf/postconf.c
View File

@@ -5,6 +5,7 @@
/* Postfix configuration utility
/* SYNOPSIS
/* .fi
/* .ti -4
/* \fBManaging main.cf:\fR
/*
/* \fBpostconf\fR [\fB-dfhHnopvx\fR] [\fB-c \fIconfig_dir\fR]
@@ -19,6 +20,7 @@
/* \fBpostconf\fR \fB-X\fR [\fB-pv\fR] [\fB-c \fIconfig_dir\fR]
/* \fIparameter ...\fR
/*
/* .ti -4
/* \fBManaging master.cf service entries:\fR
/*
/* \fBpostconf\fR \fB-M\fR [\fB-fovx\fR] [\fB-c \fIconfig_dir\fR]
@@ -33,6 +35,7 @@
/* \fBpostconf\fR \fB-MX\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR]
/* \fIservice\fB/\fItype ...\fR
/*
/* .ti -4
/* \fBManaging master.cf service fields:\fR
/*
/* \fBpostconf\fR \fB-F\fR [\fB-fhHovx\fR] [\fB-c \fIconfig_dir\fR]
@@ -41,6 +44,7 @@
/* \fBpostconf\fR \fB-F\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR]
/* \fIservice\fB/\fItype\fB/\fIfield\fB=\fIvalue ...\fR
/*
/* .ti -4
/* \fBManaging master.cf service parameters:\fR
/*
/* \fBpostconf\fR \fB-P\fR [\fB-fhHovx\fR] [\fB-c \fIconfig_dir\fR]
@@ -52,6 +56,7 @@
/* \fBpostconf\fR \fB-PX\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR]
/* \fIservice\fB/\fItype\fB/\fIparameter ...\fR
/*
/* .ti -4
/* \fBManaging bounce message templates:\fR
/*
/* \fBpostconf\fR \fB-b\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR]
@@ -60,10 +65,12 @@
/* \fBpostconf\fR \fB-t\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR]
/* [\fItemplate_file\fR]
/*
/* .ti -4
/* \fBManaging TLS features:\fR
/*
/* \fBpostconf\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR] \fB-T \fImode\fR
/* \fBpostconf\fR \fB-T \fImode\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR]
/*
/* .ti -4
/* \fBManaging other configuration:\fR
/*
/* \fBpostconf\fR \fB-a\fR|\fB-A\fR|\fB-l\fR|\fB-m\fR [\fB-v\fR]
@@ -187,9 +194,9 @@
/* This feature is available with Postfix 2.9 and later.
/* .IP \fB-F\fR
/* Show \fBmaster.cf\fR per-entry field settings (by default
/* all services and all fields), formatted as one
/* "\fIservice/type/field=value\fR" per line. Specify \fB-Ff\fR
/* to fold long lines.
/* all services and all fields), formatted as
/* "\fIservice/type/field=value\fR", one per line. Specify
/* \fB-Ff\fR to fold long lines.
/*
/* Specify one or more "\fIservice/type/field\fR" instances
/* on the \fBpostconf\fR(1) command line to limit the output
@@ -389,8 +396,8 @@
/* This feature is available with Postfix 2.11 and later.
/* .IP \fB-P\fR
/* Show \fBmaster.cf\fR service parameter settings (by default
/* all services and all parameters). formatted as one
/* "\fIservice/type/parameter=value\fR" per line. Specify
/* all services and all parameters), formatted as
/* "\fIservice/type/parameter=value\fR", one per line. Specify
/* \fB-Pf\fR to fold long lines.
/*
/* Specify one or more "\fIservice/type/parameter\fR" instances

6
postfix/src/postfix/postfix.c
View File

@@ -54,7 +54,7 @@
/* earliest convenience.
/* .IP \fBstatus\fR
/* Indicate if the Postfix mail system is currently running.
/* .IP "\fBset-permissions\fR [\fIname\fR=\fIvalue ...\fR]
/* .IP "\fBset-permissions\fR [\fIname\fR=\fIvalue ...\fR]"
/* Set the ownership and permissions of Postfix related files and
/* directories, as specified in the \fBpostfix-files\fR file.
/* .sp
@@ -66,13 +66,13 @@
/* This feature is available in Postfix 2.1 and later. With
/* Postfix 2.0 and earlier, use "\fB$config_directory/post-install
/* set-permissions\fR".
/* .IP "\fBtls\fR \fIsubcommand\fR
/* .IP "\fBtls\fR \fIsubcommand\fR"
/* Enable opportunistic TLS in the Postfix SMTP client or
/* server, and manage Postfix SMTP server TLS private keys and
/* certificates. See postfix-tls(1) for documentation.
/* .sp
/* This feature is available in Postfix 3.1 and later.
/* .IP "\fBupgrade-configuration\fR [\fIname\fR=\fIvalue ...\fR]
/* .IP "\fBupgrade-configuration\fR [\fIname\fR=\fIvalue ...\fR]"
/* Update the \fBmain.cf\fR and \fBmaster.cf\fR files with information
/* that Postfix needs in order to run: add or update services, and add
/* or update configuration parameter settings.

9
postfix/src/postmulti/postmulti.c
View File

@@ -5,11 +5,13 @@
/* Postfix multi-instance manager
/* SYNOPSIS
/* .fi
/* \fBENABLING MULTI-INSTANCE MANAGEMENT:\fR
/* .ti -4
/* \fBEnabling multi-instance management:\fR
/*
/* \fBpostmulti\fR \fB-e init\fR [\fB-v\fR]
/*
/* \fBITERATOR MODE:\fR
/* .ti -4
/* \fBIterator mode:\fR
/*
/* \fBpostmulti\fR \fB-l\fR [\fB-aRv\fR] [\fB-g \fIgroup\fR]
/* [\fB-i \fIname\fR]
@@ -20,7 +22,8 @@
/* \fBpostmulti\fR \fB-x\fR [\fB-aRv\fR] [\fB-g \fIgroup\fR]
/* [\fB-i \fIname\fR] \fIcommand...\fR
/*
/* \fBLIFE-CYCLE MANAGEMENT:\fR
/* .ti -4
/* \fBLife-cycle management:\fR
/*
/* \fBpostmulti\fR \fB-e create\fR [\fB-av\fR]
/* [\fB-g \fIgroup\fR] [\fB-i \fIname\fR] [\fB-G \fIgroup\fR]

83
postfix/src/postqueue/postqueue.c
View File

@@ -4,6 +4,7 @@
/* SUMMARY
/* Postfix queue control
/* SYNOPSIS
/* .ti -4
/* \fBTo flush the mail queue\fR:
/*
/* \fBpostqueue\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR] \fB-f\fR
@@ -12,6 +13,7 @@
/*
/* \fBpostqueue\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR] \fB-s \fIsite\fR
/*
/* .ti -4
/* \fBTo list the mail queue\fR:
/*
/* \fBpostqueue\fR [\fB-v\fR] [\fB-c \fIconfig_dir\fR] \fB-j\fR
@@ -51,42 +53,8 @@
/* from the showq(8) daemon. The result is a stream of zero
/* or more JSON objects, one per queue file. Each object is
/* followed by a newline character to support simple streaming
/* parsers.
/* .sp
/* Object members have string values unless indicated otherwise.
/* Programs should ignore object members that are not listed
/* here; the list of members is expected to grow over time.
/* .RS
/* .IP \fBqueue_name\fR
/* The name of the queue where the message was found. Note
/* that the contents of the mail queue may change while it is
/* being listed; some messages may appear more than once, and
/* some messages may be missed.
/* .IP \fBqueue_id\fR
/* The queue file name. The name may be reused unless
/* "enable_long_queue_ids = true".
/* .IP \fBarrival_time\fR
/* The number of seconds since the start of the UNIX epoch.
/* .IP \fBmessage_size\fR
/* The number of bytes in the message header and body. This
/* number does not include message envelope information. It
/* is approximately equal to the number of bytes that would
/* be transmitted via SMTP including the <CR><LF> line endings.
/* .IP \fBsender\fR
/* The envelope sender address.
/* .IP \fBrecipients\fR
/* An array containing zero or more objects with members:
/* .RS
/* .IP \fBaddress\fR
/* One recipient address.
/* .IP \fBdelay_reason\fR
/* If present, the reason for delayed delivery. Some delayed
/* recipients have no delay reason, for example, when delivery
/* is in progress or when the system was stopped before it
/* could record the reason.
/* .RE
/* .RE
/* .IP
/* parsers. See "\fBJSON OBJECT FORMAT\fR" below for details.
/*
/* This feature is available in Postfix 3.1 and later.
/* .IP \fB-p\fR
/* Produce a traditional sendmail-style queue listing.
@@ -120,6 +88,47 @@
/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR
/* options make the software increasingly verbose. As of Postfix 2.3,
/* this option is available for the super-user only.
/* JSON OBJECT FORMAT
/* .ad
/* .fi
/* Each JSON object represents one queue file; it is emitted
/* as a single text line followed by a newline character.
/*
/* Object members have string values unless indicated otherwise.
/* Programs should ignore object members that are not listed
/* here; the list of members is expected to grow over time.
/* .IP \fBqueue_name\fR
/* The name of the queue where the message was found. Note
/* that the contents of the mail queue may change while it is
/* being listed; some messages may appear more than once, and
/* some messages may be missed.
/* .IP \fBqueue_id\fR
/* The queue file name. The queue_id may be reused within a
/* Postfix instance unless "enable_long_queue_ids = true" and
/* time is monotonic. Even then, the queue_id is not expected
/* to be unique between different Postfix instances. Management
/* tools that require a unique name should combine the queue_id
/* with the myhostname setting of the Postfix instance.
/* .IP \fBarrival_time\fR
/* The number of seconds since the start of the UNIX epoch.
/* .IP \fBmessage_size\fR
/* The number of bytes in the message header and body. This
/* number does not include message envelope information. It
/* is approximately equal to the number of bytes that would
/* be transmitted via SMTP including the <CR><LF> line endings.
/* .IP \fBsender\fR
/* The envelope sender address.
/* .IP \fBrecipients\fR
/* An array containing zero or more objects with members:
/* .RS
/* .IP \fBaddress\fR
/* One recipient address.
/* .IP \fBdelay_reason\fR
/* If present, the reason for delayed delivery. Delayed
/* recipients may have no delay reason, for example, while
/* delivery is in progress, or after the system was stopped
/* before it could record the reason.
/* .RE
/* SECURITY
/* .ad
/* .fi
@@ -516,7 +525,7 @@ static void unavailable(void)
static NORETURN usage(void)
{
msg_fatal_status(EX_USAGE, "usage: postqueue -f | postqueue -i queueid | postqueue -p | postqueue -s site");
msg_fatal_status(EX_USAGE, "usage: postqueue -f | postqueue -i queueid | postqueue -j | postqueue -p | postqueue -s site");
}
MAIL_VERSION_STAMP_DECLARE;

14
postfix/src/postqueue/showq_json.c
View File

@@ -157,13 +157,13 @@ static void format_json(VSTREAM *showq_stream)
ATTR_TYPE_END) != 5)
msg_fatal_status(EX_SOFTWARE, "malformed showq server response");
vstream_printf("{");
vstream_printf("\"queue_name\": \"%s\",",
vstream_printf("\"queue_name\": \"%s\", ",
json_quote(quote_buf, STR(queue_name)));
vstream_printf("\"queue_id\": \"%s\",",
vstream_printf("\"queue_id\": \"%s\", ",
json_quote(quote_buf, STR(queue_id)));
vstream_printf("\"arrival_time\": %ld,", arrival_time);
vstream_printf("\"message_size\": %ld,", message_size);
vstream_printf("\"sender\": \"%s\",",
vstream_printf("\"arrival_time\": %ld, ", arrival_time);
vstream_printf("\"message_size\": %ld, ", message_size);
vstream_printf("\"sender\": \"%s\", ",
json_quote(quote_buf, STR(addr)));
/*
@@ -174,7 +174,7 @@ static void format_json(VSTREAM *showq_stream)
vstream_printf("\"recipients\": [");
for (rcpt_count = 0; (showq_status = attr_scan_more(showq_stream)) > 0; rcpt_count++) {
if (rcpt_count > 0)
vstream_printf(",");
vstream_printf(", ");
vstream_printf("{");
if (attr_scan(showq_stream, ATTR_FLAG_MORE | ATTR_FLAG_STRICT,
RECV_ATTR_STR(MAIL_ATTR_RECIP, addr),
@@ -184,7 +184,7 @@ static void format_json(VSTREAM *showq_stream)
vstream_printf("\"address\": \"%s\"",
json_quote(quote_buf, STR(addr)));
if (LEN(why) > 0)
vstream_printf(",\"delay_reason\": \"%s\"",
vstream_printf(", \"delay_reason\": \"%s\"",
json_quote(quote_buf, STR(why)));
vstream_printf("}");
}

2
postfix/src/qmgr/qmgr.c
View File

@@ -73,7 +73,7 @@
/* .IP "\fBslow start\fR"
/* This strategy eliminates "thundering herd" problems by slowly
/* adjusting the number of parallel deliveries to the same destination.
/* .IP "\fBround robin\fR
/* .IP "\fBround robin\fR"
/* The queue manager sorts delivery requests by destination.
/* Round-robin selection prevents one destination from dominating
/* deliveries to other destinations.

2
postfix/src/sendmail/sendmail.c
View File

@@ -110,7 +110,7 @@
/* With all Postfix versions, you can specify a directory pathname
/* with the MAIL_CONFIG environment variable to override the
/* location of configuration files.
/* .IP "\fB-F \fIfull_name\fR
/* .IP "\fB-F \fIfull_name\fR"
/* Set the sender full name. This overrides the NAME environment
/* variable, and is used only with messages that
/* have no \fBFrom:\fR message header.

2
postfix/src/smtpstone/qmqp-sink.c
View File

@@ -36,7 +36,7 @@
/* .IP \fB-v\fR
/* Increase verbosity. Specify \fB-v -v\fR to see some of the QMQP
/* conversation.
/* .IP "\fB-x \fItime\fR
/* .IP "\fB-x \fItime\fR"
/* Terminate after \fItime\fR seconds. This is to facilitate memory
/* leak testing.
/* SEE ALSO

2
postfix/src/util/slmdb.c
View File

@@ -149,7 +149,7 @@
/* CA_SLMDB_CTL_END. The following text enumerates the symbolic
/* request names and the corresponding argument types.
/* .RS
/* .IP "CA_SLMDB_CTL_LONGJMP_FN(void (*)(void *, int))
/* .IP "CA_SLMDB_CTL_LONGJMP_FN(void (*)(void *, int))"
/* Call-back function pointer. The function is called to repeat
/* a failed bulk-mode transaction from the start. The arguments
/* are the application context and the setjmp() or sigsetjmp()

6
postfix/src/util/vstream.c
View File

@@ -294,11 +294,11 @@
/* .IP "CA_VSTREAM_CTL_DOUBLE (no arguments)"
/* Use separate buffers for reading and for writing. This prevents
/* unread input from being discarded upon change of I/O direction.
/* .IP "CA_VSTREAM_CTL_READ_FD(int)
/* .IP "CA_VSTREAM_CTL_READ_FD(int)"
/* The argument specifies the file descriptor to be used for reading.
/* This feature is limited to double-buffered streams, and makes the
/* stream non-seekable.
/* .IP "CA_VSTREAM_CTL_WRITE_FD(int)
/* .IP "CA_VSTREAM_CTL_WRITE_FD(int)"
/* The argument specifies the file descriptor to be used for writing.
/* This feature is limited to double-buffered streams, and makes the
/* stream non-seekable.
@@ -315,7 +315,7 @@
/* .IP "CA_VSTREAM_CTL_WAITPID_FN(int (*)(pid_t, WAIT_STATUS_T *, int))"
/* A pointer to function that behaves like waitpid(). This information
/* is used by the vstream_pclose() routine.
/* .IP "CA_VSTREAM_CTL_TIMEOUT(int)
/* .IP "CA_VSTREAM_CTL_TIMEOUT(int)"
/* The deadline for a descriptor to become readable in case of a read
/* request, or writable in case of a write request. Specify a value
/* of 0 to disable deadlines.

2
postfix/src/util/vstring.c
View File

@@ -134,7 +134,7 @@
/* The function takes a VSTRING pointer and a list of zero or
/* more macros with zer or more arguments, terminated with
/* CA_VSTRING_CTL_END which has none.
/* .IP "CA_VSTRING_CTL_MAXLEN(ssize_t len)
/* .IP "CA_VSTRING_CTL_MAXLEN(ssize_t len)"
/* Specifies a hard upper limit on a string's length. When the
/* length would be exceeded, the program simulates a memory
/* allocation problem (i.e. it terminates through msg_fatal()).