mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-09-03 23:55:18 +00:00
Code Issues Releases Wiki Activity

postfix-3.2-20161231

Browse Source
This commit is contained in:
Wietse Venema
2016-12-31 00:00:00 -05:00
committed by Viktor Dukhovni
parent 152d80bcc2
commit 730db84450
23 changed files with 397 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
postfix/HISTORY
View File

@@ -22724,3 +22724,16 @@ Apologies for any names omitted.
or the command must be invoked with root priveleges. This or the command must be invoked with root priveleges. This
mitigates a problem with the PHP mail() function. Files: mitigates a problem with the PHP mail() function. Files:
global/mail_conf.[hc], sendmail/sendmail.c. global/mail_conf.[hc], sendmail/sendmail.c.
20161228
Documentation: moved the "BACKWARDS COMPATIBILITY" sections
to the end of ldap_table, mysql_table, pgsql_table, and
sqlite_table, renamed to "OBSOLETE MAIN.CF PARAMETERS".
20161231
Bugfix (introduced: 20160521): segfault (null pointer) in
cidr, pcre, and regexp table when an input does not match
an ENDIF-less IF operator. Found during code maintenance.
File: util/cidr_map.c, util/dict_regexp.c, util/dict_pcre.c.

43
postfix/html/ldap_table.5.html
View File

@@ -30,31 +30,12 @@ LDAP_TABLE(5) LDAP_TABLE(5)
example is given at the end of this manual. example is given at the end of this manual.
This configuration method is available with Postfix version 2.1 and This configuration method is available with Postfix version 2.1 and
later. See the section "BACKWARDS COMPATIBILITY" below for older Post- later. See the section "OBSOLETE MAIN.CF PARAMETERS" below for older
fix versions. Postfix versions.
For details about LDAP SSL and STARTTLS, see the section on SSL and For details about LDAP SSL and STARTTLS, see the section on SSL and
STARTTLS below. STARTTLS below.
<b>BACKWARDS COMPATIBILITY</b>
For backwards compatibility with Postfix version 2.0 and earlier, LDAP
parameters can also be defined in <a href="postconf.5.html">main.cf</a>. Specify as LDAP source a
name that doesn't begin with a slash or a dot. The LDAP parameters
will then be accessible as the name you've given the source in its def-
inition, an underscore, and the name of the parameter. For example, if
the map is specified as "<a href="ldap_table.5.html">ldap</a>:<i>ldapsource</i>", the "server_host" parameter
below would be defined in <a href="postconf.5.html">main.cf</a> as "<i>ldapsource</i>_server_host".
Note: with this form, the passwords for the LDAP sources are written in
<a href="postconf.5.html">main.cf</a>, which is normally world-readable. Support for this form will
be removed in a future Postfix version.
For backwards compatibility with the pre 2.2 LDAP clients, <b>result_fil-</b>
<b>ter</b> can for now be used instead of <b>result_format</b>, when the latter
parameter is not also set. The new name better reflects the function
of the parameter. This compatibility interface may be removed in a
future release.
<b>LIST MEMBERSHIP</b> <b>LIST MEMBERSHIP</b>
When using LDAP to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, When using LDAP to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>,
$<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under- $<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under-
@@ -651,6 +632,26 @@ LDAP_TABLE(5) LDAP_TABLE(5)
list of their maildrops, which will be treated as <a href="http://tools.ietf.org/html/rfc822">RFC822</a> addresses to list of their maildrops, which will be treated as <a href="http://tools.ietf.org/html/rfc822">RFC822</a> addresses to
which the message will be delivered. which the message will be delivered.
<b>OBSOLETE MAIN.CF PARAMETERS</b>
For backwards compatibility with Postfix version 2.0 and earlier, LDAP
parameters can also be defined in <a href="postconf.5.html">main.cf</a>. Specify as LDAP source a
name that doesn't begin with a slash or a dot. The LDAP parameters
will then be accessible as the name you've given the source in its def-
inition, an underscore, and the name of the parameter. For example, if
the map is specified as "<a href="ldap_table.5.html">ldap</a>:<i>ldapsource</i>", the "server_host" parameter
below would be defined in <a href="postconf.5.html">main.cf</a> as "<i>ldapsource</i>_server_host".
Note: with this form, the passwords for the LDAP sources are written in
<a href="postconf.5.html">main.cf</a>, which is normally world-readable. Support for this form will
be removed in a future Postfix version.
<b>OTHER OBSOLETE FEATURES</b>
For backwards compatibility with the pre 2.2 LDAP clients, <b>result_fil-</b>
<b>ter</b> can for now be used instead of <b>result_format</b>, when the latter
parameter is not also set. The new name better reflects the function
of the parameter. This compatibility interface may be removed in a
future release.
<b>SEE ALSO</b> <b>SEE ALSO</b>
<a href="postmap.1.html">postmap(1)</a>, Postfix lookup table manager <a href="postmap.1.html">postmap(1)</a>, Postfix lookup table manager
<a href="postconf.5.html">postconf(5)</a>, configuration parameters <a href="postconf.5.html">postconf(5)</a>, configuration parameters

42
postfix/html/mysql_table.5.html
View File

@@ -26,35 +26,6 @@ MYSQL_TABLE(5) MYSQL_TABLE(5)
The file /etc/postfix/mysql-aliases.cf has the same format as the Post- The file /etc/postfix/mysql-aliases.cf has the same format as the Post-
fix <a href="postconf.5.html">main.cf</a> file, and can specify the parameters described below. fix <a href="postconf.5.html">main.cf</a> file, and can specify the parameters described below.
<b>BACKWARDS COMPATIBILITY</b>
For compatibility with other Postfix lookup tables, MySQL parameters
can also be defined in <a href="postconf.5.html">main.cf</a>. In order to do that, specify as MySQL
source a name that doesn't begin with a slash or a dot. The MySQL
parameters will then be accessible as the name you've given the source
in its definition, an underscore, and the name of the parameter. For
example, if the map is specified as "<a href="mysql_table.5.html">mysql</a>:<i>mysqlname</i>", the parameter
"hosts" below would be defined in <a href="postconf.5.html">main.cf</a> as "<i>mysqlname</i>_hosts".
Note: with this form, the passwords for the MySQL sources are written
in <a href="postconf.5.html">main.cf</a>, which is normally world-readable. Support for this form
will be removed in a future Postfix version.
Normally, the SQL query is specified via a single <b>query</b> parameter
(described in more detail below). When this parameter is not specified
in the map definition, Postfix reverts to an older interface, with the
SQL query constructed from the <b>select_field</b>, <b>table</b>, <b>where_field</b> and
<b>additional_conditions</b> parameters. The old interface will be gradually
phased out. To migrate to the new interface set:
<b>query</b> = SELECT [<i>select</i><b>_</b><i>field</i>]
FROM [<i>table</i>]
WHERE [<i>where</i><b>_</b><i>field</i>] = '%s'
[<i>additional</i><b>_</b><i>conditions</i>]
Insert the value, not the name, of each legacy parameter. Note that the
<b>additional_conditions</b> parameter is optional and if not empty, will
always start with <b>AND</b>.
<b>LIST MEMBERSHIP</b> <b>LIST MEMBERSHIP</b>
When using SQL to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, When using SQL to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>,
$<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under- $<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under-
@@ -316,6 +287,19 @@ MYSQL_TABLE(5) MYSQL_TABLE(5)
select goto from alias where address=param; select goto from alias where address=param;
END END
<b>OBSOLETE MAIN.CF PARAMETERS</b>
For compatibility with other Postfix lookup tables, MySQL parameters
can also be defined in <a href="postconf.5.html">main.cf</a>. In order to do that, specify as MySQL
source a name that doesn't begin with a slash or a dot. The MySQL
parameters will then be accessible as the name you've given the source
in its definition, an underscore, and the name of the parameter. For
example, if the map is specified as "<a href="mysql_table.5.html">mysql</a>:<i>mysqlname</i>", the parameter
"hosts" would be defined in <a href="postconf.5.html">main.cf</a> as "<i>mysqlname</i>_hosts".
Note: with this form, the passwords for the MySQL sources are written
in <a href="postconf.5.html">main.cf</a>, which is normally world-readable. Support for this form
will be removed in a future Postfix version.
<b>OBSOLETE QUERY INTERFACE</b> <b>OBSOLETE QUERY INTERFACE</b>
This section describes an interface that is deprecated as of Postfix This section describes an interface that is deprecated as of Postfix
2.2. It is replaced by the more general <b>query</b> interface described 2.2. It is replaced by the more general <b>query</b> interface described

47
postfix/html/pgsql_table.5.html
View File

@@ -26,40 +26,6 @@ PGSQL_TABLE(5) PGSQL_TABLE(5)
The file /etc/postfix/pgsql-aliases.cf has the same format as the Post- The file /etc/postfix/pgsql-aliases.cf has the same format as the Post-
fix <a href="postconf.5.html">main.cf</a> file, and can specify the parameters described below. fix <a href="postconf.5.html">main.cf</a> file, and can specify the parameters described below.
<b>BACKWARDS COMPATIBILITY</b>
For compatibility with other Postfix lookup tables, PostgreSQL parame-
ters can also be defined in <a href="postconf.5.html">main.cf</a>. In order to do that, specify as
PostgreSQL source a name that doesn't begin with a slash or a dot. The
PostgreSQL parameters will then be accessible as the name you've given
the source in its definition, an underscore, and the name of the param-
eter. For example, if the map is specified as "<a href="pgsql_table.5.html">pgsql</a>:<i>pgsqlname</i>", the
parameter "hosts" below would be defined in <a href="postconf.5.html">main.cf</a> as "<i>pgsql-</i>
<i>name</i>_hosts".
Note: with this form, the passwords for the PostgreSQL sources are
written in <a href="postconf.5.html">main.cf</a>, which is normally world-readable. Support for this
form will be removed in a future Postfix version.
Normally, the SQL query is specified via a single <b>query</b> parameter
(described in more detail below). When this parameter is not specified
in the map definition, Postfix reverts to an older interface, with the
SQL query constructed from the <b>select_function</b>, <b>select_field</b>, <b>table</b>,
<b>where_field</b> and <b>additional_conditions</b> parameters. The old interface
will be gradually phased out. To migrate to the new interface set:
<b>query</b> = SELECT <i>select</i><b>_</b><i>function</i>('%s')
or in the absence of <b>select_function</b>, the lower precedence:
<b>query</b> = SELECT <i>select</i><b>_</b><i>field</i>
FROM <i>table</i>
WHERE <i>where</i><b>_</b><i>field</i> = '%s'
<i>additional</i><b>_</b><i>conditions</i>
Use the value, not the name, of each legacy parameter. Note that the
<b>additional_conditions</b> parameter is optional and if not empty, will
always start with <b>AND</b>.
<b>LIST MEMBERSHIP</b> <b>LIST MEMBERSHIP</b>
When using SQL to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, When using SQL to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>,
$<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under- $<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under-
@@ -227,6 +193,19 @@ PGSQL_TABLE(5) PGSQL_TABLE(5)
the limit is exceeded. Setting the limit to 1 ensures that the limit is exceeded. Setting the limit to 1 ensures that
lookups do not return multiple values. lookups do not return multiple values.
<b>OBSOLETE MAIN.CF PARAMETERS</b>
For compatibility with other Postfix lookup tables, PostgreSQL parame-
ters can also be defined in <a href="postconf.5.html">main.cf</a>. In order to do that, specify as
PostgreSQL source a name that doesn't begin with a slash or a dot. The
PostgreSQL parameters will then be accessible as the name you've given
the source in its definition, an underscore, and the name of the param-
eter. For example, if the map is specified as "<a href="pgsql_table.5.html">pgsql</a>:<i>pgsqlname</i>", the
parameter "hosts" would be defined in <a href="postconf.5.html">main.cf</a> as "<i>pgsqlname</i>_hosts".
Note: with this form, the passwords for the PostgreSQL sources are
written in <a href="postconf.5.html">main.cf</a>, which is normally world-readable. Support for this
form will be removed in a future Postfix version.
<b>OBSOLETE QUERY INTERFACES</b> <b>OBSOLETE QUERY INTERFACES</b>
This section describes query interfaces that are deprecated as of Post- This section describes query interfaces that are deprecated as of Post-
fix 2.2. Please migrate to the new <b>query</b> interface as the old inter- fix 2.2. Please migrate to the new <b>query</b> interface as the old inter-

34
postfix/html/sqlite_table.5.html
View File

@@ -26,31 +26,6 @@ SQLITE_TABLE(5) SQLITE_TABLE(5)
The file /etc/postfix/sqlite-aliases.cf has the same format as the The file /etc/postfix/sqlite-aliases.cf has the same format as the
Postfix <a href="postconf.5.html">main.cf</a> file, and can specify the parameters described below. Postfix <a href="postconf.5.html">main.cf</a> file, and can specify the parameters described below.
<b>BACKWARDS COMPATIBILITY</b>
For compatibility with other Postfix lookup tables, SQLite parameters
can also be defined in <a href="postconf.5.html">main.cf</a>. In order to do that, specify as SQLite
source a name that doesn't begin with a slash or a dot. The SQLite
parameters will then be accessible as the name you've given the source
in its definition, an underscore, and the name of the parameter. For
example, if the map is specified as "<a href="sqlite_table.5.html">sqlite</a>:<i>sqlitename</i>", the parameter
"query" below would be defined in <a href="postconf.5.html">main.cf</a> as "<i>sqlitename</i>_query".
Normally, the SQL query is specified via a single <b>query</b> parameter
(described in more detail below). When this parameter is not specified
in the map definition, Postfix reverts to an older interface, with the
SQL query constructed from the <b>select_field</b>, <b>table</b>, <b>where_field</b> and
<b>additional_conditions</b> parameters. The old interface will be gradually
phased out. To migrate to the new interface set:
<b>query</b> = SELECT [<i>select</i><b>_</b><i>field</i>]
FROM [<i>table</i>]
WHERE [<i>where</i><b>_</b><i>field</i>] = '%s'
[<i>additional</i><b>_</b><i>conditions</i>]
Insert the value, not the name, of each legacy parameter. Note that the
<b>additional_conditions</b> parameter is optional and if not empty, will
always start with <b>AND</b>.
<b>LIST MEMBERSHIP</b> <b>LIST MEMBERSHIP</b>
When using SQL to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, When using SQL to store lists such as $<a href="postconf.5.html#mynetworks">mynetworks</a>, $<a href="postconf.5.html#mydestination">mydestination</a>,
$<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under- $<a href="postconf.5.html#relay_domains">relay_domains</a>, $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, etc., it is important to under-
@@ -195,6 +170,15 @@ SQLITE_TABLE(5) SQLITE_TABLE(5)
the limit is exceeded. Setting the limit to 1 ensures that the limit is exceeded. Setting the limit to 1 ensures that
lookups do not return multiple values. lookups do not return multiple values.
<b>OBSOLETE MAIN.CF PARAMETERS</b>
For compatibility with other Postfix lookup tables, SQLite parameters
can also be defined in <a href="postconf.5.html">main.cf</a>. In order to do that, specify as SQLite
source a name that doesn't begin with a slash or a dot. The SQLite
parameters will then be accessible as the name you've given the source
in its definition, an underscore, and the name of the parameter. For
example, if the map is specified as "<a href="sqlite_table.5.html">sqlite</a>:<i>sqlitename</i>", the parameter
"query" would be defined in <a href="postconf.5.html">main.cf</a> as "<i>sqlitename</i>_query".
<b>OBSOLETE QUERY INTERFACE</b> <b>OBSOLETE QUERY INTERFACE</b>
This section describes an interface that is deprecated as of Postfix This section describes an interface that is deprecated as of Postfix
2.2. It is replaced by the more general <b>query</b> interface described 2.2. It is replaced by the more general <b>query</b> interface described

54
postfix/man/man5/ldap_table.5
View File

@@ -32,35 +32,11 @@ the Postfix main.cf file, and can specify the parameters
described below. An example is given at the end of this manual. described below. An example is given at the end of this manual.
This configuration method is available with Postfix version This configuration method is available with Postfix version
2.1 and later. See the section "BACKWARDS COMPATIBILITY" 2.1 and later. See the section "OBSOLETE MAIN.CF PARAMETERS"
below for older Postfix versions. below for older Postfix versions.
For details about LDAP SSL and STARTTLS, see the section For details about LDAP SSL and STARTTLS, see the section
on SSL and STARTTLS below. on SSL and STARTTLS below.
.SH "BACKWARDS COMPATIBILITY"
.na
.nf
.ad
.fi
For backwards compatibility with Postfix version 2.0 and earlier,
LDAP parameters can also be defined in main.cf. Specify
as LDAP source a name that doesn't begin with a slash or
a dot. The LDAP parameters will then be accessible as the
name you've given the source in its definition, an underscore,
and the name of the parameter. For example, if the map is
specified as "ldap:\fIldapsource\fR", the "server_host"
parameter below would be defined in main.cf as
"\fIldapsource\fR_server_host".
Note: with this form, the passwords for the LDAP sources are
written in main.cf, which is normally world\-readable. Support
for this form will be removed in a future Postfix version.
For backwards compatibility with the pre
2.2 LDAP clients, \fBresult_filter\fR can for now be used instead
of \fBresult_format\fR, when the latter parameter is not also set.
The new name better reflects the function of the parameter. This
compatibility interface may be removed in a future release.
.SH "LIST MEMBERSHIP" .SH "LIST MEMBERSHIP"
.na .na
.nf .nf
@@ -702,6 +678,34 @@ whose mailacceptinggeneralid attribute is "ldapuser", read
the "maildrop" attributes of those found, and build a list the "maildrop" attributes of those found, and build a list
of their maildrops, which will be treated as RFC822 addresses of their maildrops, which will be treated as RFC822 addresses
to which the message will be delivered. to which the message will be delivered.
.SH "OBSOLETE MAIN.CF PARAMETERS"
.na
.nf
.ad
.fi
For backwards compatibility with Postfix version 2.0 and earlier,
LDAP parameters can also be defined in main.cf. Specify
as LDAP source a name that doesn't begin with a slash or
a dot. The LDAP parameters will then be accessible as the
name you've given the source in its definition, an underscore,
and the name of the parameter. For example, if the map is
specified as "ldap:\fIldapsource\fR", the "server_host"
parameter below would be defined in main.cf as
"\fIldapsource\fR_server_host".
Note: with this form, the passwords for the LDAP sources are
written in main.cf, which is normally world\-readable. Support
for this form will be removed in a future Postfix version.
.SH "OTHER OBSOLETE FEATURES"
.na
.nf
.ad
.fi
For backwards compatibility with the pre
2.2 LDAP clients, \fBresult_filter\fR can for now be used instead
of \fBresult_format\fR, when the latter parameter is not also set.
The new name better reflects the function of the parameter. This
compatibility interface may be removed in a future release.
.SH "SEE ALSO" .SH "SEE ALSO"
.na .na
.nf .nf

54
postfix/man/man5/mysql_table.5
View File

@@ -28,43 +28,6 @@ table in main.cf, for example:
The file /etc/postfix/mysql\-aliases.cf has the same format as The file /etc/postfix/mysql\-aliases.cf has the same format as
the Postfix main.cf file, and can specify the parameters the Postfix main.cf file, and can specify the parameters
described below. described below.
.SH "BACKWARDS COMPATIBILITY"
.na
.nf
.ad
.fi
For compatibility with other Postfix lookup tables, MySQL
parameters can also be defined in main.cf. In order to do that,
specify as MySQL source a name that doesn't begin with a slash
or a dot. The MySQL parameters will then be accessible as the
name you've given the source in its definition, an underscore,
and the name of the parameter. For example, if the map is
specified as "mysql:\fImysqlname\fR", the parameter "hosts"
below would be defined in main.cf as "\fImysqlname\fR_hosts".
Note: with this form, the passwords for the MySQL sources are
written in main.cf, which is normally world\-readable. Support
for this form will be removed in a future Postfix version.
Normally, the SQL query is specified via a single \fBquery\fR
parameter (described in more detail below). When this
parameter is not specified in the map definition, Postfix
reverts to an older interface, with the SQL query constructed
from the \fBselect_field\fR, \fBtable\fR, \fBwhere_field\fR
and \fBadditional_conditions\fR parameters. The old interface
will be gradually phased out. To migrate to the new interface
set:
.nf
\fBquery\fR = SELECT [\fIselect_field\fR]
FROM [\fItable\fR]
WHERE [\fIwhere_field\fR] = '%s'
[\fIadditional_conditions\fR]
.fi
Insert the value, not the name, of each legacy parameter. Note
that the \fBadditional_conditions\fR parameter is optional
and if not empty, will always start with \fBAND\fR.
.SH "LIST MEMBERSHIP" .SH "LIST MEMBERSHIP"
.na .na
.nf .nf
@@ -350,6 +313,23 @@ CREATE [DEFINER=`user`@`host`] PROCEDURE
select goto from alias where address=param; select goto from alias where address=param;
END END
.fi .fi
.SH "OBSOLETE MAIN.CF PARAMETERS"
.na
.nf
.ad
.fi
For compatibility with other Postfix lookup tables, MySQL
parameters can also be defined in main.cf. In order to do that,
specify as MySQL source a name that doesn't begin with a slash
or a dot. The MySQL parameters will then be accessible as the
name you've given the source in its definition, an underscore,
and the name of the parameter. For example, if the map is
specified as "mysql:\fImysqlname\fR", the parameter "hosts"
would be defined in main.cf as "\fImysqlname\fR_hosts".
Note: with this form, the passwords for the MySQL sources are
written in main.cf, which is normally world\-readable. Support
for this form will be removed in a future Postfix version.
.SH "OBSOLETE QUERY INTERFACE" .SH "OBSOLETE QUERY INTERFACE"
.na .na
.nf .nf

64
postfix/man/man5/pgsql_table.5
View File

@@ -28,51 +28,6 @@ PostgreSQL source as a lookup table in main.cf, for example:
The file /etc/postfix/pgsql\-aliases.cf has the same format as The file /etc/postfix/pgsql\-aliases.cf has the same format as
the Postfix main.cf file, and can specify the parameters the Postfix main.cf file, and can specify the parameters
described below. described below.
.SH "BACKWARDS COMPATIBILITY"
.na
.nf
.ad
.fi
For compatibility with other Postfix lookup tables, PostgreSQL
parameters can also be defined in main.cf. In order to do
that, specify as PostgreSQL source a name that doesn't begin
with a slash or a dot. The PostgreSQL parameters will then
be accessible as the name you've given the source in its
definition, an underscore, and the name of the parameter. For
example, if the map is specified as "pgsql:\fIpgsqlname\fR",
the parameter "hosts" below would be defined in main.cf as
"\fIpgsqlname\fR_hosts".
Note: with this form, the passwords for the PostgreSQL sources
are written in main.cf, which is normally world\-readable.
Support for this form will be removed in a future Postfix
version.
Normally, the SQL query is specified via a single \fBquery\fR
parameter (described in more detail below). When this
parameter is not specified in the map definition, Postfix
reverts to an older interface, with the SQL query
constructed from the \fBselect_function\fR, \fBselect_field\fR,
\fBtable\fR, \fBwhere_field\fR and \fBadditional_conditions\fR
parameters. The old interface will be gradually phased
out. To migrate to the new interface set:
.nf
\fBquery\fR = SELECT \fIselect_function\fR('%s')
.fi
or in the absence of \fBselect_function\fR, the lower precedence:
.nf
\fBquery\fR = SELECT \fIselect_field\fR
FROM \fItable\fR
WHERE \fIwhere_field\fR = '%s'
\fIadditional_conditions\fR
.fi
Use the value, not the name, of each legacy parameter. Note
that the \fBadditional_conditions\fR parameter is optional
and if not empty, will always start with \fBAND\fR.
.SH "LIST MEMBERSHIP" .SH "LIST MEMBERSHIP"
.na .na
.nf .nf
@@ -257,6 +212,25 @@ A setting of zero disables the limit. Lookups fail with a
temporary error if the limit is exceeded. Setting the temporary error if the limit is exceeded. Setting the
limit to 1 ensures that lookups do not return multiple limit to 1 ensures that lookups do not return multiple
values. values.
.SH "OBSOLETE MAIN.CF PARAMETERS"
.na
.nf
.ad
.fi
For compatibility with other Postfix lookup tables, PostgreSQL
parameters can also be defined in main.cf. In order to do
that, specify as PostgreSQL source a name that doesn't begin
with a slash or a dot. The PostgreSQL parameters will then
be accessible as the name you've given the source in its
definition, an underscore, and the name of the parameter. For
example, if the map is specified as "pgsql:\fIpgsqlname\fR",
the parameter "hosts" would be defined in main.cf as
"\fIpgsqlname\fR_hosts".
Note: with this form, the passwords for the PostgreSQL sources
are written in main.cf, which is normally world\-readable.
Support for this form will be removed in a future Postfix
version.
.SH "OBSOLETE QUERY INTERFACES" .SH "OBSOLETE QUERY INTERFACES"
.na .na
.nf .nf

46
postfix/man/man5/sqlite_table.5
View File

@@ -28,39 +28,6 @@ table in main.cf, for example:
The file /etc/postfix/sqlite\-aliases.cf has the same format as The file /etc/postfix/sqlite\-aliases.cf has the same format as
the Postfix main.cf file, and can specify the parameters the Postfix main.cf file, and can specify the parameters
described below. described below.
.SH "BACKWARDS COMPATIBILITY"
.na
.nf
.ad
.fi
For compatibility with other Postfix lookup tables, SQLite
parameters can also be defined in main.cf. In order to do that,
specify as SQLite source a name that doesn't begin with a slash
or a dot. The SQLite parameters will then be accessible as the
name you've given the source in its definition, an underscore,
and the name of the parameter. For example, if the map is
specified as "sqlite:\fIsqlitename\fR", the parameter "query"
below would be defined in main.cf as "\fIsqlitename\fR_query".
Normally, the SQL query is specified via a single \fBquery\fR
parameter (described in more detail below). When this
parameter is not specified in the map definition, Postfix
reverts to an older interface, with the SQL query constructed
from the \fBselect_field\fR, \fBtable\fR, \fBwhere_field\fR
and \fBadditional_conditions\fR parameters. The old interface
will be gradually phased out. To migrate to the new interface
set:
.nf
\fBquery\fR = SELECT [\fIselect_field\fR]
FROM [\fItable\fR]
WHERE [\fIwhere_field\fR] = '%s'
[\fIadditional_conditions\fR]
.fi
Insert the value, not the name, of each legacy parameter. Note
that the \fBadditional_conditions\fR parameter is optional
and if not empty, will always start with \fBAND\fR.
.SH "LIST MEMBERSHIP" .SH "LIST MEMBERSHIP"
.na .na
.nf .nf
@@ -223,6 +190,19 @@ A setting of zero disables the limit. Lookups fail with a
temporary error if the limit is exceeded. Setting the temporary error if the limit is exceeded. Setting the
limit to 1 ensures that lookups do not return multiple limit to 1 ensures that lookups do not return multiple
values. values.
.SH "OBSOLETE MAIN.CF PARAMETERS"
.na
.nf
.ad
.fi
For compatibility with other Postfix lookup tables, SQLite
parameters can also be defined in main.cf. In order to do that,
specify as SQLite source a name that doesn't begin with a slash
or a dot. The SQLite parameters will then be accessible as the
name you've given the source in its definition, an underscore,
and the name of the parameter. For example, if the map is
specified as "sqlite:\fIsqlitename\fR", the parameter "query"
would be defined in main.cf as "\fIsqlitename\fR_query".
.SH "OBSOLETE QUERY INTERFACE" .SH "OBSOLETE QUERY INTERFACE"
.na .na
.nf .nf

48
postfix/proto/ldap_table
View File

@@ -26,33 +26,11 @@
# described below. An example is given at the end of this manual. # described below. An example is given at the end of this manual.
# #
# This configuration method is available with Postfix version # This configuration method is available with Postfix version
# 2.1 and later. See the section "BACKWARDS COMPATIBILITY" # 2.1 and later. See the section "OBSOLETE MAIN.CF PARAMETERS"
# below for older Postfix versions. # below for older Postfix versions.
# #
# For details about LDAP SSL and STARTTLS, see the section # For details about LDAP SSL and STARTTLS, see the section
# on SSL and STARTTLS below. # on SSL and STARTTLS below.
# BACKWARDS COMPATIBILITY
# .ad
# .fi
# For backwards compatibility with Postfix version 2.0 and earlier,
# LDAP parameters can also be defined in main.cf. Specify
# as LDAP source a name that doesn't begin with a slash or
# a dot. The LDAP parameters will then be accessible as the
# name you've given the source in its definition, an underscore,
# and the name of the parameter. For example, if the map is
# specified as "ldap:\fIldapsource\fR", the "server_host"
# parameter below would be defined in main.cf as
# "\fIldapsource\fR_server_host".
#
# Note: with this form, the passwords for the LDAP sources are
# written in main.cf, which is normally world-readable. Support
# for this form will be removed in a future Postfix version.
#
# For backwards compatibility with the pre
# 2.2 LDAP clients, \fBresult_filter\fR can for now be used instead
# of \fBresult_format\fR, when the latter parameter is not also set.
# The new name better reflects the function of the parameter. This
# compatibility interface may be removed in a future release.
# LIST MEMBERSHIP # LIST MEMBERSHIP
# .ad # .ad
# .fi # .fi
@@ -684,6 +662,30 @@
# the "maildrop" attributes of those found, and build a list # the "maildrop" attributes of those found, and build a list
# of their maildrops, which will be treated as RFC822 addresses # of their maildrops, which will be treated as RFC822 addresses
# to which the message will be delivered. # to which the message will be delivered.
# OBSOLETE MAIN.CF PARAMETERS
# .ad
# .fi
# For backwards compatibility with Postfix version 2.0 and earlier,
# LDAP parameters can also be defined in main.cf. Specify
# as LDAP source a name that doesn't begin with a slash or
# a dot. The LDAP parameters will then be accessible as the
# name you've given the source in its definition, an underscore,
# and the name of the parameter. For example, if the map is
# specified as "ldap:\fIldapsource\fR", the "server_host"
# parameter below would be defined in main.cf as
# "\fIldapsource\fR_server_host".
#
# Note: with this form, the passwords for the LDAP sources are
# written in main.cf, which is normally world-readable. Support
# for this form will be removed in a future Postfix version.
# OTHER OBSOLETE FEATURES
# .ad
# .fi
# For backwards compatibility with the pre
# 2.2 LDAP clients, \fBresult_filter\fR can for now be used instead
# of \fBresult_format\fR, when the latter parameter is not also set.
# The new name better reflects the function of the parameter. This
# compatibility interface may be removed in a future release.
# SEE ALSO # SEE ALSO
# postmap(1), Postfix lookup table manager # postmap(1), Postfix lookup table manager
# postconf(5), configuration parameters # postconf(5), configuration parameters

50
postfix/proto/mysql_table
View File

@@ -22,41 +22,6 @@
# The file /etc/postfix/mysql-aliases.cf has the same format as # The file /etc/postfix/mysql-aliases.cf has the same format as
# the Postfix main.cf file, and can specify the parameters # the Postfix main.cf file, and can specify the parameters
# described below. # described below.
# BACKWARDS COMPATIBILITY
# .ad
# .fi
# For compatibility with other Postfix lookup tables, MySQL
# parameters can also be defined in main.cf. In order to do that,
# specify as MySQL source a name that doesn't begin with a slash
# or a dot. The MySQL parameters will then be accessible as the
# name you've given the source in its definition, an underscore,
# and the name of the parameter. For example, if the map is
# specified as "mysql:\fImysqlname\fR", the parameter "hosts"
# below would be defined in main.cf as "\fImysqlname\fR_hosts".
#
# Note: with this form, the passwords for the MySQL sources are
# written in main.cf, which is normally world-readable. Support
# for this form will be removed in a future Postfix version.
#
# Normally, the SQL query is specified via a single \fBquery\fR
# parameter (described in more detail below). When this
# parameter is not specified in the map definition, Postfix
# reverts to an older interface, with the SQL query constructed
# from the \fBselect_field\fR, \fBtable\fR, \fBwhere_field\fR
# and \fBadditional_conditions\fR parameters. The old interface
# will be gradually phased out. To migrate to the new interface
# set:
#
# .nf
# \fBquery\fR = SELECT [\fIselect_field\fR]
# FROM [\fItable\fR]
# WHERE [\fIwhere_field\fR] = '%s'
# [\fIadditional_conditions\fR]
# .fi
#
# Insert the value, not the name, of each legacy parameter. Note
# that the \fBadditional_conditions\fR parameter is optional
# and if not empty, will always start with \fBAND\fR.
# LIST MEMBERSHIP # LIST MEMBERSHIP
# .ad # .ad
# .fi # .fi
@@ -336,6 +301,21 @@
# select goto from alias where address=param; # select goto from alias where address=param;
# END # END
# .fi # .fi
# OBSOLETE MAIN.CF PARAMETERS
# .ad
# .fi
# For compatibility with other Postfix lookup tables, MySQL
# parameters can also be defined in main.cf. In order to do that,
# specify as MySQL source a name that doesn't begin with a slash
# or a dot. The MySQL parameters will then be accessible as the
# name you've given the source in its definition, an underscore,
# and the name of the parameter. For example, if the map is
# specified as "mysql:\fImysqlname\fR", the parameter "hosts"
# would be defined in main.cf as "\fImysqlname\fR_hosts".
#
# Note: with this form, the passwords for the MySQL sources are
# written in main.cf, which is normally world-readable. Support
# for this form will be removed in a future Postfix version.
# OBSOLETE QUERY INTERFACE # OBSOLETE QUERY INTERFACE
# .ad # .ad
# .fi # .fi

60
postfix/proto/pgsql_table
View File

@@ -22,49 +22,6 @@
# The file /etc/postfix/pgsql-aliases.cf has the same format as # The file /etc/postfix/pgsql-aliases.cf has the same format as
# the Postfix main.cf file, and can specify the parameters # the Postfix main.cf file, and can specify the parameters
# described below. # described below.
# BACKWARDS COMPATIBILITY
# .ad
# .fi
# For compatibility with other Postfix lookup tables, PostgreSQL
# parameters can also be defined in main.cf. In order to do
# that, specify as PostgreSQL source a name that doesn't begin
# with a slash or a dot. The PostgreSQL parameters will then
# be accessible as the name you've given the source in its
# definition, an underscore, and the name of the parameter. For
# example, if the map is specified as "pgsql:\fIpgsqlname\fR",
# the parameter "hosts" below would be defined in main.cf as
# "\fIpgsqlname\fR_hosts".
#
# Note: with this form, the passwords for the PostgreSQL sources
# are written in main.cf, which is normally world-readable.
# Support for this form will be removed in a future Postfix
# version.
#
# Normally, the SQL query is specified via a single \fBquery\fR
# parameter (described in more detail below). When this
# parameter is not specified in the map definition, Postfix
# reverts to an older interface, with the SQL query
# constructed from the \fBselect_function\fR, \fBselect_field\fR,
# \fBtable\fR, \fBwhere_field\fR and \fBadditional_conditions\fR
# parameters. The old interface will be gradually phased
# out. To migrate to the new interface set:
#
# .nf
# \fBquery\fR = SELECT \fIselect_function\fR('%s')
# .fi
#
# or in the absence of \fBselect_function\fR, the lower precedence:
#
# .nf
# \fBquery\fR = SELECT \fIselect_field\fR
# FROM \fItable\fR
# WHERE \fIwhere_field\fR = '%s'
# \fIadditional_conditions\fR
# .fi
#
# Use the value, not the name, of each legacy parameter. Note
# that the \fBadditional_conditions\fR parameter is optional
# and if not empty, will always start with \fBAND\fR.
# LIST MEMBERSHIP # LIST MEMBERSHIP
# .ad # .ad
# .fi # .fi
@@ -245,6 +202,23 @@
# temporary error if the limit is exceeded. Setting the # temporary error if the limit is exceeded. Setting the
# limit to 1 ensures that lookups do not return multiple # limit to 1 ensures that lookups do not return multiple
# values. # values.
# OBSOLETE MAIN.CF PARAMETERS
# .ad
# .fi
# For compatibility with other Postfix lookup tables, PostgreSQL
# parameters can also be defined in main.cf. In order to do
# that, specify as PostgreSQL source a name that doesn't begin
# with a slash or a dot. The PostgreSQL parameters will then
# be accessible as the name you've given the source in its
# definition, an underscore, and the name of the parameter. For
# example, if the map is specified as "pgsql:\fIpgsqlname\fR",
# the parameter "hosts" would be defined in main.cf as
# "\fIpgsqlname\fR_hosts".
#
# Note: with this form, the passwords for the PostgreSQL sources
# are written in main.cf, which is normally world-readable.
# Support for this form will be removed in a future Postfix
# version.
# OBSOLETE QUERY INTERFACES # OBSOLETE QUERY INTERFACES
# .ad # .ad
# .fi # .fi

42
postfix/proto/sqlite_table
View File

@@ -22,37 +22,6 @@
# The file /etc/postfix/sqlite-aliases.cf has the same format as # The file /etc/postfix/sqlite-aliases.cf has the same format as
# the Postfix main.cf file, and can specify the parameters # the Postfix main.cf file, and can specify the parameters
# described below. # described below.
# BACKWARDS COMPATIBILITY
# .ad
# .fi
# For compatibility with other Postfix lookup tables, SQLite
# parameters can also be defined in main.cf. In order to do that,
# specify as SQLite source a name that doesn't begin with a slash
# or a dot. The SQLite parameters will then be accessible as the
# name you've given the source in its definition, an underscore,
# and the name of the parameter. For example, if the map is
# specified as "sqlite:\fIsqlitename\fR", the parameter "query"
# below would be defined in main.cf as "\fIsqlitename\fR_query".
#
# Normally, the SQL query is specified via a single \fBquery\fR
# parameter (described in more detail below). When this
# parameter is not specified in the map definition, Postfix
# reverts to an older interface, with the SQL query constructed
# from the \fBselect_field\fR, \fBtable\fR, \fBwhere_field\fR
# and \fBadditional_conditions\fR parameters. The old interface
# will be gradually phased out. To migrate to the new interface
# set:
#
# .nf
# \fBquery\fR = SELECT [\fIselect_field\fR]
# FROM [\fItable\fR]
# WHERE [\fIwhere_field\fR] = '%s'
# [\fIadditional_conditions\fR]
# .fi
#
# Insert the value, not the name, of each legacy parameter. Note
# that the \fBadditional_conditions\fR parameter is optional
# and if not empty, will always start with \fBAND\fR.
# LIST MEMBERSHIP # LIST MEMBERSHIP
# .ad # .ad
# .fi # .fi
@@ -211,6 +180,17 @@
# temporary error if the limit is exceeded. Setting the # temporary error if the limit is exceeded. Setting the
# limit to 1 ensures that lookups do not return multiple # limit to 1 ensures that lookups do not return multiple
# values. # values.
# OBSOLETE MAIN.CF PARAMETERS
# .ad
# .fi
# For compatibility with other Postfix lookup tables, SQLite
# parameters can also be defined in main.cf. In order to do that,
# specify as SQLite source a name that doesn't begin with a slash
# or a dot. The SQLite parameters will then be accessible as the
# name you've given the source in its definition, an underscore,
# and the name of the parameter. For example, if the map is
# specified as "sqlite:\fIsqlitename\fR", the parameter "query"
# would be defined in main.cf as "\fIsqlitename\fR_query".
# OBSOLETE QUERY INTERFACE # OBSOLETE QUERY INTERFACE
# .ad # .ad
# .fi # .fi

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 "20161227" #define MAIL_RELEASE_DATE "20161231"
#define MAIL_VERSION_NUMBER "3.2" #define MAIL_VERSION_NUMBER "3.2"
#ifdef SNAPSHOT #ifdef SNAPSHOT

18
postfix/src/util/Makefile.in
View File

@@ -533,7 +533,8 @@ tests: all valid_hostname_test mac_expand_test dict_test unescape_test \
base32_code_test dict_thash_test surrogate_test timecmp_test \ base32_code_test dict_thash_test surrogate_test timecmp_test \
dict_static_test dict_inline_test midna_domain_test casefold_test \ dict_static_test dict_inline_test midna_domain_test casefold_test \
dict_utf8_test strcasecmp_utf8_test vbuf_print_test dict_regexp_test \ dict_utf8_test strcasecmp_utf8_test vbuf_print_test dict_regexp_test \
dict_union_test dict_pipe_test dict_union_test dict_pipe_test miss_endif_cidr_test \
miss_endif_pcre_test miss_endif_regexp_test
root_tests: root_tests:
@@ -615,6 +616,21 @@ dict_cidr_test: dict_open dict_cidr.in dict_cidr.map dict_cidr.ref
diff dict_cidr.ref dict_cidr.tmp diff dict_cidr.ref dict_cidr.tmp
rm -f dict_cidr.tmp rm -f dict_cidr.tmp
miss_endif_cidr_test: dict_open miss_endif_cidr.map miss_endif_cidr.ref
echo get 1.2.3.5 | $(SHLIB_ENV) ./dict_open cidr:miss_endif_cidr.map read 2>&1 | sed 's/uid=[0-9][0-9][0-9]*/uid=USER/' >dict_cidr.tmp
diff miss_endif_cidr.ref dict_cidr.tmp
rm -f dict_cidr.tmp
miss_endif_pcre_test: dict_open miss_endif_re.map miss_endif_pcre.ref
echo get 1.2.3.5 | $(SHLIB_ENV) ./dict_open pcre:miss_endif_re.map read 2>&1 | sed 's/uid=[0-9][0-9][0-9]*/uid=USER/' >dict_pcre.tmp
diff miss_endif_pcre.ref dict_pcre.tmp
rm -f dict_pcre.tmp
miss_endif_regexp_test: dict_open miss_endif_re.map miss_endif_regexp.ref
echo get 1.2.3.5 | $(SHLIB_ENV) ./dict_open regexp:miss_endif_re.map read 2>&1 | sed 's/uid=[0-9][0-9][0-9]*/uid=USER/' >dict_regexp.tmp
diff miss_endif_regexp.ref dict_regexp.tmp
rm -f dict_regexp.tmp
dict_seq_test: dict_open testdb dict_seq.in dict_seq.ref dict_seq_test: dict_open testdb dict_seq.in dict_seq.ref
rm -f testdb.db testdb.dir testdb.pag rm -f testdb.db testdb.dir testdb.pag
$(SHLIB_ENV) ./dict_open hash:testdb create sync < dict_seq.in 2>&1 | sed 's/uid=[0-9][0-9][0-9]*/uid=USER/' > dict_seq.tmp $(SHLIB_ENV) ./dict_open hash:testdb create sync < dict_seq.in 2>&1 | sed 's/uid=[0-9][0-9][0-9]*/uid=USER/' > dict_seq.tmp

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

@@ -171,7 +171,7 @@ CIDR_MATCH *cidr_match_execute(CIDR_MATCH *list, const char *addr)
continue; continue;
/* An IF without matching ENDIF has no end-of block entry. */ /* An IF without matching ENDIF has no end-of block entry. */
if ((entry = entry->block_end) == 0) if ((entry = entry->block_end) == 0)
break; return (0);
/* FALLTHROUGH */ /* FALLTHROUGH */
case CIDR_MATCH_OP_ENDIF: case CIDR_MATCH_OP_ENDIF:

3
postfix/src/util/dict_pcre.c
View File

@@ -358,7 +358,7 @@ static const char *dict_pcre_lookup(DICT *dict, const char *lookup_string)
continue; continue;
/* An IF without matching ENDIF has no "endif" rule. */ /* An IF without matching ENDIF has no "endif" rule. */
if ((rule = if_rule->endif_rule) == 0) if ((rule = if_rule->endif_rule) == 0)
break; return (0);
/* FALLTHROUGH */ /* FALLTHROUGH */
/* /*
@@ -743,6 +743,7 @@ static DICT_PCRE_RULE *dict_pcre_parse_rule(const char *mapname, int lineno,
if_rule->match = regexp.match; if_rule->match = regexp.match;
if_rule->pattern = engine.pattern; if_rule->pattern = engine.pattern;
if_rule->hints = engine.hints; if_rule->hints = engine.hints;
if_rule->endif_rule = 0;
return ((DICT_PCRE_RULE *) if_rule); return ((DICT_PCRE_RULE *) if_rule);
} }

3
postfix/src/util/dict_regexp.c
View File

@@ -303,7 +303,7 @@ static const char *dict_regexp_lookup(DICT *dict, const char *lookup_string)
continue; continue;
/* An IF without matching ENDIF has no "endif" rule. */ /* An IF without matching ENDIF has no "endif" rule. */
if ((rule = if_rule->endif_rule) == 0) if ((rule = if_rule->endif_rule) == 0)
break; return (0);
/* FALLTHROUGH */ /* FALLTHROUGH */
/* /*
@@ -693,6 +693,7 @@ static DICT_REGEXP_RULE *dict_regexp_parseline(const char *mapname, int lineno,
sizeof(DICT_REGEXP_IF_RULE)); sizeof(DICT_REGEXP_IF_RULE));
if_rule->expr = expr; if_rule->expr = expr;
if_rule->match = pattern.match; if_rule->match = pattern.match;
if_rule->endif_rule = 0;
return ((DICT_REGEXP_RULE *) if_rule); return ((DICT_REGEXP_RULE *) if_rule);
} }

1
postfix/src/util/miss_endif_cidr.map Normal file
View File

@@ -0,0 +1 @@
if 1.2.3.4

4
postfix/src/util/miss_endif_cidr.ref Normal file
View File

@@ -0,0 +1,4 @@
./dict_open: warning: cidr map miss_endif_cidr.map, line 1: IF has no matching ENDIF
owner=untrusted (uid=USER)
> get 1.2.3.5
1.2.3.5: not found

4
postfix/src/util/miss_endif_pcre.ref Normal file
View File

@@ -0,0 +1,4 @@
./dict_open: warning: pcre map miss_endif_re.map, line 1: IF has no matching ENDIF
owner=untrusted (uid=USER)
> get 1.2.3.5
1.2.3.5: not found

1
postfix/src/util/miss_endif_re.map Normal file
View File

@@ -0,0 +1 @@
if /foo/

4
postfix/src/util/miss_endif_regexp.ref Normal file
View File

@@ -0,0 +1,4 @@
./dict_open: warning: regexp map miss_endif_re.map, line 1: IF has no matching ENDIF
owner=untrusted (uid=USER)
> get 1.2.3.5
1.2.3.5: not found