mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-28 04:37:56 +00:00
Code Issues Releases Wiki Activity

postfix-2.9-20111119

Browse Source
This commit is contained in:
Wietse Venema 2011-11-19 00:00:00 -05:00 committed by Viktor Dukhovni
parent ec5ea4ec15
commit 2cfc3431dc
12 changed files with 95 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postfix/HISTORY
View File

@ -17103,3 +17103,9 @@ Apologies for any names omitted.
"postconf -M inet" shows only services that listen on the "postconf -M inet" shows only services that listen on the
network, and "postconf -M smtp.unix" shows the SMTP delivery network, and "postconf -M smtp.unix" shows the SMTP delivery
agent. File: postconf.c. agent. File: postconf.c.
20111119
Cleanup: "postconf" commands in postfix-install needed to
be updated before master.cf was installed. Reported by
Sahil Tandon. File: postfix-install.

14
postfix/README_FILES/SASL_README
View File

@ -107,9 +107,9 @@ configure and operate the Dovecot authentication server.
PPoossttffiixx ttoo DDoovveeccoott SSAASSLL ccoommmmuunniiccaattiioonn PPoossttffiixx ttoo DDoovveeccoott SSAASSLL ccoommmmuunniiccaattiioonn
Communication between the Postfix SMTP server and Dovecot SASL happens via a Communication between the Postfix SMTP server and Dovecot SASL happens over a
UNIX-domain socket. Additionally, when using Dovecot version 2.0 and later, UNIX-domain socket or over a TCP socket. Dovecot 1 supports UNIX-domain socket
communication can take place over a TCP socket. communication only.
UUNNIIXX--ddoommaaiinn ssoocckkeett ccoommmmuunniiccaattiioonn UUNNIIXX--ddoommaaiinn ssoocckkeett ccoommmmuunniiccaattiioonn
@ -694,12 +694,16 @@ the section "Postfix to Dovecot SASL communication".
that it will work whether or not the Postfix SMTP server runs chrooted. that it will work whether or not the Postfix SMTP server runs chrooted.
* If you configured Dovecot for TCP socket communication, configure Postfix * If you configured Dovecot for TCP socket communication, configure Postfix
as follows (if Dovecot runs on a different machine, replace 127.0.0.1 by as follows. If Dovecot runs on a different machine, replace 127.0.0.1 by
that machine's IP address): that machine's IP address.
/etc/postfix/main.cf: /etc/postfix/main.cf:
smtpd_sasl_path = inet:127.0.0.1:12345 smtpd_sasl_path = inet:127.0.0.1:12345
NNoottee
If you specify a remote IP address, information will be sent as plaintext
over the network.
EEnnaabblliinngg SSAASSLL aauutthheennttiiccaattiioonn iinn tthhee PPoossttffiixx SSMMTTPP sseerrvveerr EEnnaabblliinngg SSAASSLL aauutthheennttiiccaattiioonn iinn tthhee PPoossttffiixx SSMMTTPP sseerrvveerr
Regardless of the SASL implementation type, enabling SMTP authentication in the Regardless of the SASL implementation type, enabling SMTP authentication in the

16
postfix/html/SASL_README.html
View File

@ -184,10 +184,9 @@ to configure and operate the Dovecot authentication server. </p>
<h4><a name="server_dovecot_comm">Postfix to Dovecot SASL communication</a></h4> <h4><a name="server_dovecot_comm">Postfix to Dovecot SASL communication</a></h4>
<p> Communication between the Postfix SMTP server <p> Communication between the Postfix SMTP server and Dovecot SASL
and Dovecot SASL happens via a UNIX-domain socket. Additionally, happens over a UNIX-domain socket or over a TCP socket. Dovecot 1
when using Dovecot version 2.0 and later, communication can take supports UNIX-domain socket communication only. </p>
place over a TCP socket.
<h5>UNIX-domain socket communication</h5> <h5>UNIX-domain socket communication</h5>
@ -1166,14 +1165,19 @@ directory, so that it will work whether or not the Postfix SMTP
server runs chrooted. </p> server runs chrooted. </p>
<li> <p> If you configured Dovecot for TCP socket communication, <li> <p> If you configured Dovecot for TCP socket communication,
configure Postfix as follows (if Dovecot runs on a different configure Postfix as follows. If Dovecot runs on a different machine,
machine, replace 127.0.0.1 by that machine's IP address): </p> replace 127.0.0.1 by that machine's IP address. </p>
<pre> <pre>
/etc/postfix/<a href="postconf.5.html">main.cf</a>: /etc/postfix/<a href="postconf.5.html">main.cf</a>:
<a href="postconf.5.html#smtpd_sasl_path">smtpd_sasl_path</a> = inet:127.0.0.1:12345 <a href="postconf.5.html#smtpd_sasl_path">smtpd_sasl_path</a> = inet:127.0.0.1:12345
</pre> </pre>
<strong>Note</strong>
<p> If you specify a remote IP address, information
will be sent as plaintext over the network. </p>
</ul> </ul>
<h4><a name="server_sasl_authc">Enabling SASL authentication <h4><a name="server_sasl_authc">Enabling SASL authentication

77
postfix/html/master.5.html
View File

@ -119,47 +119,50 @@ MASTER(5) MASTER(5)
trolled with the <b><a href="postconf.5.html#queue_directory">queue_directory</a></b> configura- trolled with the <b><a href="postconf.5.html#queue_directory">queue_directory</a></b> configura-
tion parameter in <a href="postconf.5.html">main.cf</a>). tion parameter in <a href="postconf.5.html">main.cf</a>).
On Solaris systems the <b>pass</b> type is imple-
mented with streams sockets.
This feature is available as of Postfix ver- This feature is available as of Postfix ver-
sion 2.5. sion 2.5.
<b>Private (default: y)</b> <b>Private (default: y)</b>
Whether or not access is restricted to the mail Whether or not access is restricted to the mail
system. Internet (type <b>inet</b>) services can't be system. Internet (type <b>inet</b>) services can't be
private. private.
<b>Unprivileged (default: y)</b> <b>Unprivileged (default: y)</b>
Whether the service runs with root privileges or as Whether the service runs with root privileges or as
the owner of the Postfix system (the owner name is the owner of the Postfix system (the owner name is
controlled by the <b><a href="postconf.5.html#mail_owner">mail_owner</a></b> configuration variable controlled by the <b><a href="postconf.5.html#mail_owner">mail_owner</a></b> configuration variable
in the <a href="postconf.5.html">main.cf</a> file). in the <a href="postconf.5.html">main.cf</a> file).
The <a href="local.8.html"><b>local</b>(8)</a>, <a href="pipe.8.html"><b>pipe</b>(8)</a>, <a href="spawn.8.html"><b>spawn</b>(8)</a>, and <a href="virtual.8.html"><b>virtual</b>(8)</a> The <a href="local.8.html"><b>local</b>(8)</a>, <a href="pipe.8.html"><b>pipe</b>(8)</a>, <a href="spawn.8.html"><b>spawn</b>(8)</a>, and <a href="virtual.8.html"><b>virtual</b>(8)</a>
daemons require privileges. daemons require privileges.
<b>Chroot (default: y)</b> <b>Chroot (default: y)</b>
Whether or not the service runs chrooted to the Whether or not the service runs chrooted to the
mail queue directory (pathname is controlled by the mail queue directory (pathname is controlled by the
<b><a href="postconf.5.html#queue_directory">queue_directory</a></b> configuration variable in the <b><a href="postconf.5.html#queue_directory">queue_directory</a></b> configuration variable in the
<a href="postconf.5.html">main.cf</a> file). <a href="postconf.5.html">main.cf</a> file).
Chroot should not be used with the <a href="local.8.html"><b>local</b>(8)</a>, Chroot should not be used with the <a href="local.8.html"><b>local</b>(8)</a>,
<a href="pipe.8.html"><b>pipe</b>(8)</a>, <a href="spawn.8.html"><b>spawn</b>(8)</a>, and <a href="virtual.8.html"><b>virtual</b>(8)</a> daemons. <a href="pipe.8.html"><b>pipe</b>(8)</a>, <a href="spawn.8.html"><b>spawn</b>(8)</a>, and <a href="virtual.8.html"><b>virtual</b>(8)</a> daemons.
Although the <a href="proxymap.8.html"><b>proxymap</b>(8)</a> server can run chrooted, Although the <a href="proxymap.8.html"><b>proxymap</b>(8)</a> server can run chrooted,
doing so defeats most of the purpose of having that doing so defeats most of the purpose of having that
service in the first place. service in the first place.
The files in the examples/chroot-setup subdirectory The files in the examples/chroot-setup subdirectory
of the Postfix source archive show set up a Postfix of the Postfix source archive show set up a Postfix
chroot environment on a variety of systems. See chroot environment on a variety of systems. See
also <a href="BASIC_CONFIGURATION_README.html">BASIC_CONFIGURATION_README</a> for issues related also <a href="BASIC_CONFIGURATION_README.html">BASIC_CONFIGURATION_README</a> for issues related
to running daemons chrooted. to running daemons chrooted.
<b>Wake up time (default: 0)</b> <b>Wake up time (default: 0)</b>
Automatically wake up the named service after the Automatically wake up the named service after the
specified number of seconds. The wake up is imple- specified number of seconds. The wake up is imple-
mented by connecting to the service and sending a mented by connecting to the service and sending a
wake up request. A ? at the end of the wake-up wake up request. A ? at the end of the wake-up
time field requests that no wake up events be sent time field requests that no wake up events be sent
before the first time a service is used. Specify 0 before the first time a service is used. Specify 0
for no automatic wake up. for no automatic wake up.
@ -167,59 +170,59 @@ MASTER(5) MASTER(5)
a wake up timer. a wake up timer.
<b>Process limit (default: $<a href="postconf.5.html#default_process_limit">default_process_limit</a>)</b> <b>Process limit (default: $<a href="postconf.5.html#default_process_limit">default_process_limit</a>)</b>
The maximum number of processes that may execute The maximum number of processes that may execute
this service simultaneously. Specify 0 for no this service simultaneously. Specify 0 for no
process count limit. process count limit.
NOTE: Some Postfix services must be configured as a NOTE: Some Postfix services must be configured as a
single-process service (for example, <a href="qmgr.8.html"><b>qmgr</b>(8)</a>) and single-process service (for example, <a href="qmgr.8.html"><b>qmgr</b>(8)</a>) and
some services must be configured with no process some services must be configured with no process
limit (for example, <a href="cleanup.8.html"><b>cleanup</b>(8)</a>). These limits must limit (for example, <a href="cleanup.8.html"><b>cleanup</b>(8)</a>). These limits must
not be changed. not be changed.
<b>Command name + arguments</b> <b>Command name + arguments</b>
The command to be executed. Characters that are The command to be executed. Characters that are
special to the shell such as "&gt;" or "|" have no special to the shell such as "&gt;" or "|" have no
special meaning here, and quotes cannot be used to special meaning here, and quotes cannot be used to
protect arguments containing whitespace. protect arguments containing whitespace.
The command name is relative to the Postfix daemon The command name is relative to the Postfix daemon
directory (pathname is controlled by the <b><a href="postconf.5.html#daemon_directory">dae</a>-</b> directory (pathname is controlled by the <b><a href="postconf.5.html#daemon_directory">dae</a>-</b>
<b><a href="postconf.5.html#daemon_directory">mon_directory</a></b> configuration variable). <b><a href="postconf.5.html#daemon_directory">mon_directory</a></b> configuration variable).
The command argument syntax for specific commands The command argument syntax for specific commands
is specified in the respective daemon manual page. is specified in the respective daemon manual page.
The following command-line options have the same The following command-line options have the same
effect for all daemon programs: effect for all daemon programs:
<b>-D</b> Run the daemon under control by the command <b>-D</b> Run the daemon under control by the command
specified with the <b><a href="postconf.5.html#debugger_command">debugger_command</a></b> variable specified with the <b><a href="postconf.5.html#debugger_command">debugger_command</a></b> variable
in the <a href="postconf.5.html">main.cf</a> configuration file. See in the <a href="postconf.5.html">main.cf</a> configuration file. See
<a href="DEBUG_README.html">DEBUG_README</a> for hints and tips. <a href="DEBUG_README.html">DEBUG_README</a> for hints and tips.
<b>-o</b> <i>name</i>=<i>value</i> <b>-o</b> <i>name</i>=<i>value</i>
Override the named <a href="postconf.5.html">main.cf</a> configuration Override the named <a href="postconf.5.html">main.cf</a> configuration
parameter. The parameter value can refer to parameter. The parameter value can refer to
other parameters as <i>$name</i> etc., just like in other parameters as <i>$name</i> etc., just like in
<a href="postconf.5.html">main.cf</a>. See <a href="postconf.5.html"><b>postconf</b>(5)</a> for syntax. <a href="postconf.5.html">main.cf</a>. See <a href="postconf.5.html"><b>postconf</b>(5)</a> for syntax.
NOTE 1: do not specify whitespace around the NOTE 1: do not specify whitespace around the
"=". In parameter values, either avoid "=". In parameter values, either avoid
whitespace altogether, use commas instead of whitespace altogether, use commas instead of
spaces, or consider overrides like "-o spaces, or consider overrides like "-o
name=$override_parameter" with $over- name=$override_parameter" with $over-
ride_parameter set in <a href="postconf.5.html">main.cf</a>. ride_parameter set in <a href="postconf.5.html">main.cf</a>.
NOTE 2: Over-zealous use of parameter over- NOTE 2: Over-zealous use of parameter over-
rides makes the Postfix configuration hard rides makes the Postfix configuration hard
to understand and maintain. At a certain to understand and maintain. At a certain
point, it might be easier to configure mul- point, it might be easier to configure mul-
tiple instances of Postfix, instead of con- tiple instances of Postfix, instead of con-
figuring multiple personalities via mas- figuring multiple personalities via mas-
ter.cf. ter.cf.
<b>-v</b> Increase the verbose logging level. Specify <b>-v</b> Increase the verbose logging level. Specify
multiple <b>-v</b> options to make a Postfix daemon multiple <b>-v</b> options to make a Postfix daemon
process increasingly verbose. process increasingly verbose.
@ -232,7 +235,7 @@ MASTER(5) MASTER(5)
<a href="DEBUG_README.html">DEBUG_README</a>, Postfix debugging <a href="DEBUG_README.html">DEBUG_README</a>, Postfix debugging
<b>LICENSE</b> <b>LICENSE</b>
The Secure Mailer license must be distributed with this The Secure Mailer license must be distributed with this
software. software.
<b>AUTHOR(S)</b> <b>AUTHOR(S)</b>

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

@ -133,14 +133,14 @@ POSTCONF(1) POSTCONF(1)
human readability. human readability.
If <i>service ...</i> is specified, only the matching ser- If <i>service ...</i> is specified, only the matching ser-
vices will be output. For example, a service of vices will be output. For example, a <i>service</i> <b>of</b>
<b>inet</b> will match all services that listen on the <b>inet</b> will match all services that listen on the
network. network.
Specify zero or more argument, each with a <i>service-</i> Specify zero or more arguments, each with a <i>ser-</i>
<i>type</i> name (<b>inet</b>, <b>unix</b>, <b>fifo</b>, or <b>pass</b>) or with a <i>vice-type</i> name (<b>inet</b>, <b>unix</b>, <b>fifo</b>, or <b>pass</b>) or with
<i>service-name.service-type</i> pair, where <i>service-name</i> a <i>service-name.service-type</i> pair, where <i>service-</i>
is the first field of a <a href="master.5.html">master.cf</a> entry. <i>name</i> is the first field of a <a href="master.5.html">master.cf</a> entry.
This feature is available with Postfix 2.9 and This feature is available with Postfix 2.9 and
later. later.

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

@ -124,10 +124,10 @@ file contents. Use \fB-Mf\fR to fold long lines for human
readability. readability.
If \fIservice ...\fR is specified, only the matching services If \fIservice ...\fR is specified, only the matching services
will be output. For example, a service of \fBinet\fR will will be output. For example, a \fIservice\fB of \fBinet\fR
match all services that listen on the network. will match all services that listen on the network.
Specify zero or more argument, each with a \fIservice-type\fR Specify zero or more arguments, each with a \fIservice-type\fR
name (\fBinet\fR, \fBunix\fR, \fBfifo\fR, or \fBpass\fR) name (\fBinet\fR, \fBunix\fR, \fBfifo\fR, or \fBpass\fR)
or with a \fIservice-name.service-type\fR pair, where or with a \fIservice-name.service-type\fR pair, where
\fIservice-name\fR is the first field of a master.cf entry. \fIservice-name\fR is the first field of a master.cf entry.

3
postfix/man/man5/master.5
View File

@ -109,6 +109,9 @@ descriptor passing) per connection request.
The service name is a pathname relative to the Postfix The service name is a pathname relative to the Postfix
queue directory (pathname controlled with the \fBqueue_directory\fR queue directory (pathname controlled with the \fBqueue_directory\fR
configuration parameter in main.cf). configuration parameter in main.cf).
.sp
On Solaris systems the \fBpass\fR type is implemented with
streams sockets.
This feature is available as of Postfix version 2.5. This feature is available as of Postfix version 2.5.
.RE .RE

4
postfix/postfix-install
View File

@ -363,7 +363,7 @@ HTML files. Specify \"no\" if you do not want to install these files."
: ${install_root=/} : ${install_root=/}
: ${tempdir=`pwd`} : ${tempdir=`pwd`}
: ${config_directory=`bin/postconf -h -d config_directory`} : ${config_directory=`bin/postconf -c conf -h -d config_directory`}
# Find out the location of installed configuration files. # Find out the location of installed configuration files.
@ -446,7 +446,7 @@ do
case "$junk" in case "$junk" in
"") eval unset $name;; "") eval unset $name;;
esac esac
eval : \${$name=\`bin/postconf -d -h $name\`} || exit 1 eval : \${$name=\`bin/postconf -c conf -d -h $name\`} || exit 1
done done
# Override settings manually. # Override settings manually.

16
postfix/proto/SASL_README.html
View File

@ -184,10 +184,9 @@ to configure and operate the Dovecot authentication server. </p>
<h4><a name="server_dovecot_comm">Postfix to Dovecot SASL communication</a></h4> <h4><a name="server_dovecot_comm">Postfix to Dovecot SASL communication</a></h4>
<p> Communication between the Postfix SMTP server <p> Communication between the Postfix SMTP server and Dovecot SASL
and Dovecot SASL happens via a UNIX-domain socket. Additionally, happens over a UNIX-domain socket or over a TCP socket. Dovecot 1
when using Dovecot version 2.0 and later, communication can take supports UNIX-domain socket communication only. </p>
place over a TCP socket.
<h5>UNIX-domain socket communication</h5> <h5>UNIX-domain socket communication</h5>
@ -1166,14 +1165,19 @@ directory, so that it will work whether or not the Postfix SMTP
server runs chrooted. </p> server runs chrooted. </p>
<li> <p> If you configured Dovecot for TCP socket communication, <li> <p> If you configured Dovecot for TCP socket communication,
configure Postfix as follows (if Dovecot runs on a different configure Postfix as follows. If Dovecot runs on a different machine,
machine, replace 127.0.0.1 by that machine's IP address): </p> replace 127.0.0.1 by that machine's IP address. </p>
<pre> <pre>
/etc/postfix/main.cf: /etc/postfix/main.cf:
smtpd_sasl_path = inet:127.0.0.1:12345 smtpd_sasl_path = inet:127.0.0.1:12345
</pre> </pre>
<strong>Note</strong>
<p> If you specify a remote IP address, information
will be sent as plaintext over the network. </p>
</ul> </ul>
<h4><a name="server_sasl_authc">Enabling SASL authentication <h4><a name="server_sasl_authc">Enabling SASL authentication

3
postfix/proto/master
View File

@ -103,6 +103,9 @@
# The service name is a pathname relative to the Postfix # The service name is a pathname relative to the Postfix
# queue directory (pathname controlled with the \fBqueue_directory\fR # queue directory (pathname controlled with the \fBqueue_directory\fR
# configuration parameter in main.cf). # configuration parameter in main.cf).
# .sp
# On Solaris systems the \fBpass\fR type is implemented with
# streams sockets.
# #
# This feature is available as of Postfix version 2.5. # This feature is available as of Postfix version 2.5.
# .RE # .RE

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 * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20111118" #define MAIL_RELEASE_DATE "20111119"
#define MAIL_VERSION_NUMBER "2.9" #define MAIL_VERSION_NUMBER "2.9"
#ifdef SNAPSHOT #ifdef SNAPSHOT

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

@ -118,10 +118,10 @@
/* readability. /* readability.
/* /*
/* If \fIservice ...\fR is specified, only the matching services /* If \fIservice ...\fR is specified, only the matching services
/* will be output. For example, a service of \fBinet\fR will /* will be output. For example, a \fIservice\fB of \fBinet\fR
/* match all services that listen on the network. /* will match all services that listen on the network.
/* /*
/* Specify zero or more argument, each with a \fIservice-type\fR /* Specify zero or more arguments, each with a \fIservice-type\fR
/* name (\fBinet\fR, \fBunix\fR, \fBfifo\fR, or \fBpass\fR) /* name (\fBinet\fR, \fBunix\fR, \fBfifo\fR, or \fBpass\fR)
/* or with a \fIservice-name.service-type\fR pair, where /* or with a \fIservice-name.service-type\fR pair, where
/* \fIservice-name\fR is the first field of a master.cf entry. /* \fIservice-name\fR is the first field of a master.cf entry.