etrn support yes (per-destination log for authorized destinations only)
fcntl locking yes (runtime configurable)
flock locking yes (runtime configurable)
-genericstable no (to be done)
+genericstable yes (Postfix 2.2 generic(5) table)
greylist yes (delegated policy script)
home mailbox yes
ident lookup no
the mx_session_limit setting. File: smtp/smtp_connect.c.
Feature: output address rewriting in the SMTP client. The
- smtp_generics_maps parameter specifies an address mapping
+ smtp_generic_maps parameter specifies an address mapping
that happens only when mail is delivered via SMTP. This is
typically used for hosts without a valid domain name, that
use something like localdomain.local instead. This feature
20050207
- Documentation: added a generics(5) manual page for consistency
+ Documentation: added a generic(5) manual page for consistency
with the already existing table driven mechanisms, added
references to or examples of the new generic mapping.
20050209
- Cleanup: the smtp generics mapping did syntax check on the
+ Cleanup: the smtp generic mapping did syntax check on the
input address instead of the result. These tests were not
going to be useful in any case, because mail_addr_map()
canonicalizes the lookup result, including @dom1->@dom2
mapping. File: smtp_map11.c.
- Cleanup: made the generics mapping documentation consistent
+ Cleanup: made the generic mapping documentation consistent
with the implementation.
Cleanup: documented the myorigin/mydomain address rewriting
- in canonical, generics and virtual alias maps.
+ in canonical, generic and virtual alias maps.
20050210
Duchovni. File: tls/tls_scache.c.
Safety: delete-behind when removing expired entries from
- TLS session caches. Some maps mis-behave when the current
- entry is deleted. File: tls/tls_scache.c.
+ TLS session caches. With some maps the enumeration method
+ mis-behaves when the current entry is deleted. File:
+ tls/tls_scache.c.
+
+20040211
+
+ Cleanup: the "generics" feature (output address rewriting)
+ is renamed to "generic", for consistency with "canonical"
+ and "virtual".
Open problems:
+ Low: 9kbyte memory leak when an expired in-memory session
+ is removed by SSL_CTX_flush_sessions(). The occurrance of
+ this is rare enough that it is a low priority.
+
Med: local and remote source port and IP address for smtpd
policy hook.
- Med: should "generics" be "generic", for consistency with
- "canonical" and "virtual".
-
Med: canonical/generic/virtual mapping always append
myorigin/mydomain and never remote_header_rewrite_domain;
this needs to be clear from documentation.
|users table |all mail|rewrite |relocated_maps |none |
| | |(8) | | |
|_\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b |
- |Generics |outgoing| | | |
- |table |SMTP |smtp(8) |smtp_generics_maps |none |
- | |mail | | | |
+ |Generic |outgoing| | | |
+ |mapping |SMTP |smtp(8) |smtp_generic_maps |none |
+ |table |mail | | | |
|_\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b|_\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b _\b |
|Local alias |all mail|local(8)|alias_maps |none |
|database | | | | |
Internet, because many mail servers reject mail addresses with invalid domain
names.
-With the smtp_generics_maps parameter you can specify generics(5) lookup tables
+With the smtp_generic_maps parameter you can specify generic(5) lookup tables
that replace local mail addresses by valid Internet addresses when mail leaves
-the machine via SMTP. The generics(5) mapping replaces envelope and header
+the machine via SMTP. The generic(5) mapping replaces envelope and header
addresses, and is non-recursive. It does not happen when you send mail between
addresses on the local machine.
Example:
/etc/postfix/main.cf:
- smtp_generics_maps = hash:/etc/postfix/generics
+ smtp_generic_maps = hash:/etc/postfix/generic
- /etc/postfix/generics:
+ /etc/postfix/generic:
his@localdomain.local hisaccount@hisisp.example
her@localdomain.local heraccount@herisp.example
@localdomain.local hisaccount+local@hisisp.example
P\bPo\bos\bst\btf\bfi\bix\bx v\bve\ber\brs\bsi\bio\bon\bn 2\b2.\b.2\b2 a\ban\bnd\bd l\bla\bat\bte\ber\br
-Postfix 2.2 uses the generics(5) address mapping to replace local fantasy email
+Postfix 2.2 uses the generic(5) address mapping to replace local fantasy email
addresses by valid Internet addresses. This mapping happens ONLY when mail
leaves the machine; not when you send mail between users on the same machine.
document.
1 /etc/postfix/main.cf:
- 2 smtp_generics_maps = hash:/etc/postfix/generics
+ 2 smtp_generic_maps = hash:/etc/postfix/generic
3
- 4 /etc/postfix/generics:
+ 4 /etc/postfix/generic:
5 his@localdomain.local hisaccount@hisisp.example
6 her@localdomain.local heraccount@herisp.example
7 @localdomain.local hisaccount+local@hisisp.example
Specify d\bdb\bbm\bm instead of h\bha\bas\bsh\bh if your system uses d\bdb\bbm\bm files instead of d\bdb\bb files.
To find out what lookup tables Postfix supports, use the command "p\bpo\bos\bst\btc\bco\bon\bnf\bf -\b-m\bm".
-Execute the command "p\bpo\bos\bst\btm\bma\bap\bp /\b/e\bet\btc\bc/\b/p\bpo\bos\bst\btf\bfi\bix\bx/\b/g\bge\ben\bne\ber\bri\bic\bcs\bs" whenever you change the
-generics table.
+Execute the command "p\bpo\bos\bst\btm\bma\bap\bp /\b/e\bet\btc\bc/\b/p\bpo\bos\bst\btf\bfi\bix\bx/\b/g\bge\ben\bne\ber\bri\bic\bc" whenever you change the
+generic table.
P\bPo\bos\bst\btf\bfi\bix\bx v\bve\ber\brs\bsi\bio\bon\bn 2\b2.\b.1\b1 a\ban\bnd\bd e\bea\bar\brl\bli\bie\ber\br
and change the patchlevel and the release date. Patches are never
issued for snapshot releases.
+Major changes with snapshot Postfix-2.2-20050211
+================================================
+
+The "generics" table feature is renamed to "generic", for consistency
+with other Postfix table names which are also singular.
+
Major changes with snapshot Postfix-2.2-20050209
================================================
domain name such as localdomain.local instead. Mail addresses that
use such domain names are often rejected by mail servers.
-The new smtp_generics_maps feature allows you to replace local mail
+The new smtp_generic_maps feature allows you to replace local mail
addresses by valid Internet addresses when mail is sent across the
Internet. It has no effect on mail that is sent between accounts
-on the local machine. The syntax is described in generics(5) and
+on the local machine. The syntax is described in generic(5) and
a detailed example is in the STANDARD_CONFIGURATION_README file.
Example:
/etc/postfix/main.cf:
- smtp_generics_maps = hash:/etc/postfix/generics
+ smtp_generic_maps = hash:/etc/postfix/generic
-/etc/postfix/generics:
+/etc/postfix/generic:
you@localdomain.local youraccount@yourisp.net
her@localdomain.local heraccount@herisp.net
@localdomain.local youraccount+local@yourisp.net
# nisms that propagate an address extension from the
# original address to the result. Specify zero or
# more of canonical, virtual, alias, forward,
-# include, or generics.
+# include, or generic.
#
# owner_request_special
# Give special treatment to owner-listname and list-
# nisms that propagate an address extension from the
# original address to the result. Specify zero or
# more of canonical, virtual, alias, forward,
-# include, or generics.
+# include, or generic.
#
# Other parameters of interest:
#
-# GENERICS(5) GENERICS(5)
+# GENERIC(5) GENERIC(5)
#
# NAME
-# generics - Postfix generics table format
+# generic - Postfix generic table format
#
# SYNOPSIS
-# postmap /etc/postfix/generics
+# postmap /etc/postfix/generic
#
-# postmap -q "string" /etc/postfix/generics
+# postmap -q "string" /etc/postfix/generic
#
-# postmap -q - /etc/postfix/generics <inputfile
+# postmap -q - /etc/postfix/generic <inputfile
#
# DESCRIPTION
-# The optional generics(5) table specifies an address map-
-# ping that applies when mail is delivered. This is the
-# opposite of canonical(5) mapping, which applies when mail
-# is received.
+# The optional generic(5) table specifies an address mapping
+# that applies when mail is delivered. This is the opposite
+# of canonical(5) mapping, which applies when mail is
+# received.
#
-# Typically, one would use the generics(5) table on a system
+# Typically, one would use the generic(5) table on a system
# that does not have a valid Internet domain name and that
-# uses something like localdomain.local instead. The gener-
-# ics(5) table is then used by the smtp(8) client to trans-
-# form local mail addresses into valid Internet mail
+# uses something like localdomain.local instead. The
+# generic(5) table is then used by the smtp(8) client to
+# transform local mail addresses into valid Internet mail
# addresses when mail has to be sent across the Internet.
# See the EXAMPLE section at the end of this document.
#
-# The generics(5) mapping affects both message header
+# The generic(5) mapping affects both message header
# addresses (i.e. addresses that appear inside messages) and
# message envelope addresses (for example, the addresses
# that are used in SMTP protocol commands).
#
-# Normally, the generics(5) table is specified as a text
-# file that serves as input to the postmap(1) command. The
+# Normally, the generic(5) table is specified as a text file
+# that serves as input to the postmap(1) command. The
# result, an indexed file in dbm or db format, is used for
# fast searching by the mail system. Execute the command
-# "postmap /etc/postfix/generics" in order to rebuild the
+# "postmap /etc/postfix/generic" in order to rebuild the
# indexed file after changing the text file.
#
# When the table is provided via other means such as NIS,
# that the ISP supports "+" style address extensions).
#
# /etc/postfix/main.cf:
-# smtp_generics_maps = hash:/etc/postfix/generics
+# smtp_generic_maps = hash:/etc/postfix/generic
#
-# /etc/postfix/generics:
+# /etc/postfix/generic:
# his@localdomain.local hisaccount@hisisp.example
# her@localdomain.local heraccount@herisp.example
# @localdomain.local hisaccount+local@hisisp.example
#
-# Execute the command "postmap /etc/postfix/generics" when-
+# Execute the command "postmap /etc/postfix/generic" when-
# ever the table is changed. Instead of hash, some systems
# use dbm database files. To find out what tables your sys-
# tem supports use the command "postconf -m".
# The text below provides only a parameter summary. See
# postconf(5) for more details including examples.
#
-# smtp_generics_maps
+# smtp_generic_maps
# Address mapping lookup table for envelope and
# header sender and recipient addresses while deliv-
# ering mail via SMTP.
# nisms that propagate an address extension from the
# original address to the result. Specify zero or
# more of canonical, virtual, alias, forward,
-# include, or generics.
+# include, or generic.
#
# Other parameters of interest:
#
# P.O. Box 704
# Yorktown Heights, NY 10598, USA
#
-# GENERICS(5)
+# GENERIC(5)
$config_directory/aliases:f:root:-:644:p
$config_directory/canonical:f:root:-:644:p
$config_directory/cidr_table:f:root:-:644:o
-$config_directory/generics:f:root:-:644:p
+$config_directory/generics:f:root:-:644:o
+$config_directory/generic:f:root:-:644:p
$config_directory/header_checks:f:root:-:644:p
$config_directory/install.cf:f:root:-:644:o
$config_directory/main.cf:f:root:-:644:p
$manpage_directory/man5/body_checks.5:f:root:-:644
$manpage_directory/man5/canonical.5:f:root:-:644
$manpage_directory/man5/cidr_table.5:f:root:-:644
-$manpage_directory/man5/generics.5:f:root:-:644
+$manpage_directory/man5/generics.5:f:root:-:644:o
+$manpage_directory/man5/generic.5:f:root:-:644
$manpage_directory/man5/header_checks.5:f:root:-:644
$manpage_directory/man5/ldap_table.5:f:root:-:644
$manpage_directory/man5/master.5:f:root:-:644
$html_directory/discard.8.html:f:root:-:644
$html_directory/error.8.html:f:root:-:644
$html_directory/flush.8.html:f:root:-:644
-$html_directory/generics.5.html:f:root:-:644
+$html_directory/generics.5.html:f:root:-:644:o
+$html_directory/generic.5.html:f:root:-:644
$html_directory/header_checks.5.html:f:root:-:644
$html_directory/index.html:f:root:-:644
$html_directory/ldap_table.5.html:f:root:-:644
# nisms that propagate an address extension from the
# original address to the result. Specify zero or
# more of canonical, virtual, alias, forward,
-# include, or generics.
+# include, or generic.
#
# Other parameters of interest:
#
<ul>
-<li> <a href="#generics"> Generic mapping for outgoing SMTP mail </a>
+<li> <a href="#generic"> Generic mapping for outgoing SMTP mail </a>
</ul>
<td nowrap> all mail </td> <td> <a href="trivial-rewrite.8.html">trivial-<br>rewrite(8)</a> </td> <td>
<a href="postconf.5.html#relocated_maps">relocated_maps</a> </td> <td> none </td> </tr>
-<tr> <td> <a href="#generics"> Generics table </a> </td> <td>
-outgoing SMTP mail </td> <td> <a href="smtp.8.html">smtp(8)</a> </td> <td> <a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a>
+<tr> <td> <a href="#generic"> Generic mapping table </a> </td> <td>
+outgoing SMTP mail </td> <td> <a href="smtp.8.html">smtp(8)</a> </td> <td> <a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a>
</td> <td> none </td> </tr>
<tr> <td> <a href="#aliases"> Local alias database</a> </td> <td>
<ul>
-<li> <a href="#generics"> Generic mapping for outgoing SMTP mail </a>
+<li> <a href="#generic"> Generic mapping for outgoing SMTP mail </a>
</ul>
mail first, and then return it to the sender as undeliverable, with
the same reason. </p>
-<h3> <a name="generics"> Generic mapping for outgoing SMTP mail </a> </h3>
+<h3> <a name="generic"> Generic mapping for outgoing SMTP mail </a> </h3>
<p> Some hosts have no valid Internet domain name, and instead use
a name such as <i>localdomain.local</i>. This can be a problem when
you want to send mail over the Internet, because many mail servers
reject mail addresses with invalid domain names. </p>
-<p> With the <a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a> parameter you can specify <a href="generics.5.html">generics(5)</a>
+<p> With the <a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a> parameter you can specify <a href="generic.5.html">generic(5)</a>
lookup tables that replace local mail addresses by valid Internet
-addresses when mail leaves the machine via SMTP. The <a href="generics.5.html">generics(5)</a>
+addresses when mail leaves the machine via SMTP. The <a href="generic.5.html">generic(5)</a>
mapping replaces envelope and header addresses, and is non-recursive.
It does not happen when you send mail between addresses on the
local machine. </p>
<blockquote>
<pre>
/etc/postfix/main.cf:
- <a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a> = hash:/etc/postfix/generics
+ <a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a> = hash:/etc/postfix/generic
-/etc/postfix/generics:
+/etc/postfix/generic:
his@localdomain.local hisaccount@hisisp.example
her@localdomain.local heraccount@herisp.example
@localdomain.local hisaccount+local@hisisp.example
transport.5.html virtual.5.html pcre_table.5.html regexp_table.5.html \
cidr_table.5.html tcp_table.5.html header_checks.5.html \
ldap_table.5.html mysql_table.5.html pgsql_table.5.html \
- master.5.html nisplus_table.5.html generics.5.html
+ master.5.html nisplus_table.5.html generic.5.html
OTHER = postfix-manuals.html
AWK = awk '{ print; if (NR == 2) print ".pl 9999\n.ll 65" }'
MAN2HTML = man2html -t "Postfix manual - `IFS=.; set \`echo $@\`; echo \"$$1($$2)\"`"
PATH=../mantools:$$PATH; \
srctoman - $? | $(AWK) | nroff -man | uniq | $(MAN2HTML) | postlink >$@
-generics.5.html: ../proto/generics
+generic.5.html: ../proto/generic
PATH=../mantools:$$PATH; \
srctoman - $? | $(AWK) | nroff -man | uniq | $(MAN2HTML) | postlink >$@
<h3>Postfix version 2.2 and later </h3>
-<p> Postfix 2.2 uses the <a href="generics.5.html">generics(5)</a> address mapping to replace
+<p> Postfix 2.2 uses the <a href="generic.5.html">generic(5)</a> address mapping to replace
local fantasy email addresses by valid Internet addresses. This
mapping happens ONLY when mail leaves the machine; not when you
send mail between users on the same machine. </p>
<blockquote>
<pre>
1 /etc/postfix/main.cf:
-2 <a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a> = hash:/etc/postfix/generics
+2 <a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a> = hash:/etc/postfix/generic
3
-4 /etc/postfix/generics:
+4 /etc/postfix/generic:
5 his@localdomain.local hisaccount@hisisp.example
6 her@localdomain.local heraccount@herisp.example
7 @localdomain.local hisaccount+local@hisisp.example
<b>dbm</b> files instead of <b>db</b> files. To find out what lookup
tables Postfix supports, use the command "<b>postconf -m</b>". </p>
-<p> Execute the command "<b>postmap /etc/postfix/generics</b>"
-whenever you change the generics table. </p>
+<p> Execute the command "<b>postmap /etc/postfix/generic</b>"
+whenever you change the generic table. </p>
<h3>Postfix version 2.1 and earlier </h3>
nisms that propagate an address extension from the
original address to the result. Specify zero or
more of <b>canonical</b>, <b>virtual</b>, <b>alias</b>, <b>forward</b>,
- <b>include</b>, or <b>generics</b>.
+ <b>include</b>, or <b>generic</b>.
<b><a href="postconf.5.html#owner_request_special">owner_request_special</a></b>
Give special treatment to <b>owner-</b><i>listname</i> and <i>list-</i>
nisms that propagate an address extension from the
original address to the result. Specify zero or
more of <b>canonical</b>, <b>virtual</b>, <b>alias</b>, <b>forward</b>,
- <b>include</b>, or <b>generics</b>.
+ <b>include</b>, or <b>generic</b>.
Other parameters of interest:
"http://www.w3.org/TR/html4/loose.dtd">
<html> <head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title> Postfix manual - generics(5) </title>
+<title> Postfix manual - generic(5) </title>
</head> <body> <pre>
-GENERICS(5) GENERICS(5)
+GENERIC(5) GENERIC(5)
<b>NAME</b>
- generics - Postfix generics table format
+ generic - Postfix generic table format
<b>SYNOPSIS</b>
- <b>postmap /etc/postfix/generics</b>
+ <b>postmap /etc/postfix/generic</b>
- <b>postmap -q "</b><i>string</i><b>" /etc/postfix/generics</b>
+ <b>postmap -q "</b><i>string</i><b>" /etc/postfix/generic</b>
- <b>postmap -q - /etc/postfix/generics</b> <<i>inputfile</i>
+ <b>postmap -q - /etc/postfix/generic</b> <<i>inputfile</i>
<b>DESCRIPTION</b>
- The optional <a href="generics.5.html"><b>generics</b>(5)</a> table specifies an address map-
- ping that applies when mail is delivered. This is the
- opposite of <a href="canonical.5.html"><b>canonical</b>(5)</a> mapping, which applies when mail
- is received.
+ The optional <a href="generic.5.html"><b>generic</b>(5)</a> table specifies an address mapping
+ that applies when mail is delivered. This is the opposite
+ of <a href="canonical.5.html"><b>canonical</b>(5)</a> mapping, which applies when mail is
+ received.
- Typically, one would use the <a href="generics.5.html"><b>generics</b>(5)</a> table on a system
+ Typically, one would use the <a href="generic.5.html"><b>generic</b>(5)</a> table on a system
that does not have a valid Internet domain name and that
- uses something like <i>localdomain.local</i> instead. The <a href="generics.5.html"><b>gener-</b></a>
- <a href="generics.5.html"><b>ics</b>(5)</a> table is then used by the <a href="smtp.8.html"><b>smtp</b>(8)</a> client to trans-
- form local mail addresses into valid Internet mail
+ uses something like <i>localdomain.local</i> instead. The
+ <a href="generic.5.html"><b>generic</b>(5)</a> table is then used by the <a href="smtp.8.html"><b>smtp</b>(8)</a> client to
+ transform local mail addresses into valid Internet mail
addresses when mail has to be sent across the Internet.
See the EXAMPLE section at the end of this document.
- The <a href="generics.5.html"><b>generics</b>(5)</a> mapping affects both message header
+ The <a href="generic.5.html"><b>generic</b>(5)</a> mapping affects both message header
addresses (i.e. addresses that appear inside messages) and
message envelope addresses (for example, the addresses
that are used in SMTP protocol commands).
- Normally, the <a href="generics.5.html"><b>generics</b>(5)</a> table is specified as a text
- file that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ Normally, the <a href="generic.5.html"><b>generic</b>(5)</a> table is specified as a text file
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
fast searching by the mail system. Execute the command
- "<b>postmap /etc/postfix/generics</b>" in order to rebuild the
+ "<b>postmap /etc/postfix/generic</b>" in order to rebuild the
indexed file after changing the text file.
When the table is provided via other means such as NIS,
that the ISP supports "+" style address extensions).
/etc/postfix/main.cf:
- <a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a> = hash:/etc/postfix/generics
+ <a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a> = hash:/etc/postfix/generic
- /etc/postfix/generics:
+ /etc/postfix/generic:
his@localdomain.local hisaccount@hisisp.example
her@localdomain.local heraccount@herisp.example
@localdomain.local hisaccount+local@hisisp.example
- Execute the command "<b>postmap /etc/postfix/generics</b>" when-
+ Execute the command "<b>postmap /etc/postfix/generic</b>" when-
ever the table is changed. Instead of <b>hash</b>, some systems
use <b>dbm</b> database files. To find out what tables your sys-
tem supports use the command "<b>postconf -m</b>".
The text below provides only a parameter summary. See
<a href="postconf.5.html"><b>postconf</b>(5)</a> for more details including examples.
- <b><a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a></b>
+ <b><a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a></b>
Address mapping lookup table for envelope and
header sender and recipient addresses while deliv-
ering mail via SMTP.
nisms that propagate an address extension from the
original address to the result. Specify zero or
more of <b>canonical</b>, <b>virtual</b>, <b>alias</b>, <b>forward</b>,
- <b>include</b>, or <b>generics</b>.
+ <b>include</b>, or <b>generic</b>.
Other parameters of interest:
P.O. Box 704
Yorktown Heights, NY 10598, USA
- GENERICS(5)
+ GENERIC(5)
</pre> </body> </html>
<p>
Specify zero or more of <b>canonical</b>, <b>virtual</b>, <b>alias</b>,
-<b>forward</b>, <b>include</b> or <b>generics</b>. These cause
+<b>forward</b>, <b>include</b> or <b>generic</b>. These cause
address extension
propagation with <a href="canonical.5.html">canonical(5)</a>, <a href="virtual.5.html">virtual(5)</a>, and <a href="aliases.5.html">aliases(5)</a> maps,
with <a href="local.8.html">local(8)</a> .forward and :include: file lookups, and with <a href="smtp.8.html">smtp(8)</a>
-generics maps, respectively. </p>
+generic maps, respectively. </p>
<p>
Note: enabling this feature for types other than <b>canonical</b>
</DD>
-<DT><b><a name="smtp_generics_maps">smtp_generics_maps</a>
+<DT><b><a name="smtp_generic_maps">smtp_generic_maps</a>
(default: empty)</b></DT><DD>
<p> Optional lookup tables that perform address rewriting in the
domain name, but uses something like <i>localdomain.local</i>
instead. </p>
-<p> The table format and lookups are documented in <a href="generics.5.html">generics(5)</a>;
+<p> The table format and lookups are documented in <a href="generic.5.html">generic(5)</a>;
examples are shown in the <a href="ADDRESS_REWRITING_README.html">ADDRESS_REWRITING_README</a> and
<a href="STANDARD_CONFIGURATION_README.html">STANDARD_CONFIGURATION_README</a> documents. </p>
<li> <a href="canonical.5.html">canonical(5)</a>, Postfix input address rewriting
-<li> <a href="generics.5.html">generics(5)</a>, Postfix output address rewriting
+<li> <a href="generic.5.html">generic(5)</a>, Postfix output address rewriting
<li> <a href="header_checks.5.html">header_checks(5)</a>, <a href="header_checks.5.html">body_checks(5)</a>, Postfix content inspection
<a href="access.5.html">access(5)</a>, Postfix SMTP access control table
<a href="aliases.5.html">aliases(5)</a>, Postfix alias database
<a href="canonical.5.html">canonical(5)</a>, Postfix input address rewriting
- <a href="generics.5.html">generics(5)</a>, Postfix output address rewriting
+ <a href="generic.5.html">generic(5)</a>, Postfix output address rewriting
<a href="header_checks.5.html">header_checks(5)</a>, <a href="header_checks.5.html">body_checks(5)</a>, Postfix content inspection
<a href="relocated.5.html">relocated(5)</a>, Users that have moved
<a href="transport.5.html">transport(5)</a>, Postfix routing table
will ignore in the EHLO response from a remote SMTP
server.
- <b><a href="postconf.5.html#smtp_generics_maps">smtp_generics_maps</a> (empty)</b>
+ <b><a href="postconf.5.html#smtp_generic_maps">smtp_generic_maps</a> (empty)</b>
Optional lookup tables that perform address rewrit-
ing in the SMTP client, typically to transform a
locally valid address into a globally valid address
nisms that propagate an address extension from the
original address to the result. Specify zero or
more of <b>canonical</b>, <b>virtual</b>, <b>alias</b>, <b>forward</b>,
- <b>include</b>, or <b>generics</b>.
+ <b>include</b>, or <b>generic</b>.
Other parameters of interest:
man5/cidr_table.5 man5/tcp_table.5 man5/header_checks.5 \
man5/body_checks.5 man5/ldap_table.5 man5/mysql_table.5 \
man5/pgsql_table.5 man5/master.5 man5/nisplus_table.5 \
- man5/generics.5
+ man5/generic.5
TOOLS = man1/smtp-sink.1 man1/smtp-source.1 man1/qmqp-sink.1 \
man1/qmqp-source.1 man1/qshape.1
man5/cidr_table.5: ../proto/cidr_table
../mantools/srctoman - $? >$@
-man5/generics.5: ../proto/generics
+man5/generic.5: ../proto/generic
../mantools/srctoman - $? >$@
man5/header_checks.5: ../proto/header_checks
access(5), Postfix SMTP access control table
aliases(5), Postfix alias database
canonical(5), Postfix input address rewriting
-generics(5), Postfix output address rewriting
+generic(5), Postfix output address rewriting
header_checks(5), body_checks(5), Postfix content inspection
relocated(5), Users that have moved
transport(5), Postfix routing table
propagate an address extension from the original address
to the result. Specify zero or more of \fBcanonical\fR,
\fBvirtual\fR, \fBalias\fR, \fBforward\fR, \fBinclude\fR,
-or \fBgenerics\fR.
+or \fBgeneric\fR.
.IP \fBowner_request_special\fR
Give special treatment to \fBowner-\fIlistname\fR and
\fIlistname\fB-request\fR
A list of address rewriting or forwarding mechanisms that propagate
an address extension from the original address to the result.
Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-\fBforward\fR, \fBinclude\fR, or \fBgenerics\fR.
+\fBforward\fR, \fBinclude\fR, or \fBgeneric\fR.
.PP
Other parameters of interest:
.IP \fBinet_interfaces\fR
-.TH GENERICS 5
+.TH GENERIC 5
.ad
.fi
.SH NAME
-generics
+generic
\-
-Postfix generics table format
+Postfix generic table format
.SH "SYNOPSIS"
.na
.nf
-\fBpostmap /etc/postfix/generics\fR
+\fBpostmap /etc/postfix/generic\fR
-\fBpostmap -q "\fIstring\fB" /etc/postfix/generics\fR
+\fBpostmap -q "\fIstring\fB" /etc/postfix/generic\fR
-\fBpostmap -q - /etc/postfix/generics <\fIinputfile\fR
+\fBpostmap -q - /etc/postfix/generic <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi
-The optional \fBgenerics\fR(5) table specifies an address
+The optional \fBgeneric\fR(5) table specifies an address
mapping that applies when mail is delivered. This is the
opposite of \fBcanonical\fR(5) mapping, which applies when
mail is received.
-Typically, one would use the \fBgenerics\fR(5) table on a
+Typically, one would use the \fBgeneric\fR(5) table on a
system that does not have a valid Internet domain name and
that uses something like \fIlocaldomain.local\fR instead.
-The \fBgenerics\fR(5) table is then used by the \fBsmtp\fR(8)
+The \fBgeneric\fR(5) table is then used by the \fBsmtp\fR(8)
client to transform local mail addresses into valid Internet
mail addresses when mail has to be sent across the Internet.
See the EXAMPLE section at the end of this document.
-The \fBgenerics\fR(5) mapping affects both message header
+The \fBgeneric\fR(5) mapping affects both message header
addresses (i.e. addresses that appear inside messages) and
message envelope addresses (for example, the addresses that
are used in SMTP protocol commands).
-Normally, the \fBgenerics\fR(5) table is specified as a
+Normally, the \fBgeneric\fR(5) table is specified as a
text file that serves as input to the \fBpostmap\fR(1)
command. The result, an indexed file in \fBdbm\fR or
\fBdb\fR format, is used for fast searching by the mail
-system. Execute the command "\fBpostmap /etc/postfix/generics\fR"
+system. Execute the command "\fBpostmap /etc/postfix/generic\fR"
in order to rebuild the indexed file after changing the
text file.
.nf
/etc/postfix/main.cf:
.in +4
- smtp_generics_maps = hash:/etc/postfix/generics
+ smtp_generic_maps = hash:/etc/postfix/generic
.in -4
-/etc/postfix/generics:
+/etc/postfix/generic:
.in +4
his@localdomain.local hisaccount@hisisp.example
her@localdomain.local heraccount@herisp.example
.ad
.fi
-Execute the command "\fBpostmap /etc/postfix/generics\fR"
+Execute the command "\fBpostmap /etc/postfix/generic\fR"
whenever the table is changed. Instead of \fBhash\fR, some
systems use \fBdbm\fR database files. To find out what
tables your system supports use the command "\fBpostconf
The following \fBmain.cf\fR parameters are especially relevant.
The text below provides only a parameter summary. See
\fBpostconf\fR(5) for more details including examples.
-.IP \fBsmtp_generics_maps\fR
+.IP \fBsmtp_generic_maps\fR
Address mapping lookup table for envelope and header sender
and recipient addresses while delivering mail via SMTP.
.IP \fBpropagate_unmatched_extensions\fR
A list of address rewriting or forwarding mechanisms that propagate
an address extension from the original address to the result.
Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-\fBforward\fR, \fBinclude\fR, or \fBgenerics\fR.
+\fBforward\fR, \fBinclude\fR, or \fBgeneric\fR.
.PP
Other parameters of interest:
.IP \fBinet_interfaces\fR
to "\fIjoe.user+foo\fR".
.PP
Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-\fBforward\fR, \fBinclude\fR or \fBgenerics\fR. These cause
+\fBforward\fR, \fBinclude\fR or \fBgeneric\fR. These cause
address extension
propagation with \fBcanonical\fR(5), \fBvirtual\fR(5), and \fBaliases\fR(5) maps,
with \fBlocal\fR(8) .forward and :include: file lookups, and with \fBsmtp\fR(8)
-generics maps, respectively.
+generic maps, respectively.
.PP
Note: enabling this feature for types other than \fBcanonical\fR
and \fBvirtual\fR is likely to cause problems when mail is forwarded
will only connect to servers that support RFC 2487 _and_ that
provide valid server certificates. Typical use is for clients that
send all their email to a dedicated mailhub.
-.SH smtp_generics_maps (default: empty)
+.SH smtp_generic_maps (default: empty)
Optional lookup tables that perform address rewriting in the
SMTP client, typically to transform a locally valid address into
a globally valid address when sending mail across the Internet.
domain name, but uses something like \fIlocaldomain.local\fR
instead.
.PP
-The table format and lookups are documented in \fBgenerics\fR(5);
+The table format and lookups are documented in \fBgeneric\fR(5);
examples are shown in the ADDRESS_REWRITING_README and
STANDARD_CONFIGURATION_README documents.
.PP
A list of address rewriting or forwarding mechanisms that propagate
an address extension from the original address to the result.
Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-\fBforward\fR, \fBinclude\fR, or \fBgenerics\fR.
+\fBforward\fR, \fBinclude\fR, or \fBgeneric\fR.
.PP
Other parameters of interest:
.IP \fBinet_interfaces\fR
A case insensitive list of EHLO keywords (pipelining, starttls,
auth, etc.) that the SMTP client will ignore in the EHLO response
from a remote SMTP server.
-.IP "\fBsmtp_generics_maps (empty)\fR"
+.IP "\fBsmtp_generic_maps (empty)\fR"
Optional lookup tables that perform address rewriting in the
SMTP client, typically to transform a locally valid address into
a globally valid address when sending mail across the Internet.
man/man8/trivial-rewrite.8:21:.IP \fBlocal\fR
man/man5/aliases.5:140:\fBvirtual\fR, \fBalias\fR, \fBforward\fR, \fBinclude\fR,
man/man5/canonical.5:171:Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-man/man5/generics.5:11:\fBpostmap /etc/postfix/generics\fR
-man/man5/generics.5:13:\fBpostmap -q "\fIstring\fB" /etc/postfix/generics\fR
-man/man5/generics.5:15:\fBpostmap -q - /etc/postfix/generics <\fIinputfile\fR
-man/man5/generics.5:189:Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
+man/man5/generic.5:11:\fBpostmap /etc/postfix/generic\fR
+man/man5/generic.5:13:\fBpostmap -q "\fIstring\fB" /etc/postfix/generic\fR
+man/man5/generic.5:15:\fBpostmap -q - /etc/postfix/generic <\fIinputfile\fR
+man/man5/generic.5:189:Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
man/man5/postconf.5:2446:and \fBvirtual\fR is likely to cause problems when mail is forwarded
man/man5/postconf.5:4575:is \fBsmtpd\fR, corresponding to a SASL configuration file named
s;\bsmtp_data_init_timeout\b;<a href="postconf.5.html#smtp_data_init_timeout">$&</a>;g;
s;\bsmtp_data_xfer_timeout\b;<a href="postconf.5.html#smtp_data_xfer_timeout">$&</a>;g;
s;\bsmtp_defer_if_no_mx_address_found\b;<a href="postconf.5.html#smtp_defer_if_no_mx_address_found">$&</a>;g;
- s;\bsmtp_generics_maps\b;<a href="postconf.5.html#smtp_generics_maps">$&</a>;g;
+ s;\bsmtp_generic_maps\b;<a href="postconf.5.html#smtp_generic_maps">$&</a>;g;
s;\blmtp_destination_concurrency_limit\b;<a href="postconf.5.html#lmtp_destination_concurrency_limit">$&</a>;g;
s;\blmtp_destination_recip[-</bB>]*\n* *[<bB>]*ient_limit\b;<a href="postconf.5.html#lmtp_destination_recipient_limit">$&</a>;g;
s;\brelay_destination_concurrency_limit\b;<a href="postconf.5.html#relay_destination_concurrency_limit">$&</a>;g;
s/[<bB>]*access[<\/bB>]*\(5\)/<a href="access.5.html">$&<\/a>/g;
s/[<bB>]*aliases[<\/bB>]*\(5\)/<a href="aliases.5.html">$&<\/a>/g;
s/[<bB>]*canonical[<\/bB>]*\(5\)/<a href="canonical.5.html">$&<\/a>/g;
- s/[<bB>]*gener[-<\/bB>]*\n* *[<bB>]*ics[<\/bB>]*\(5\)/<a href="generics.5.html">$&<\/a>/g;
+ s/[<bB>]*gener[-<\/bB>]*\n* *[<bB>]*ic[<\/bB>]*\(5\)/<a href="generic.5.html">$&<\/a>/g;
s/[<bB>]*ldap[<\/bBiI>]*_[<\/iIbB>]*table[<\/bB>]*\(5\)/<a href="ldap_table.5.html">$&<\/a>/g;
s/[<bB>]*mas[-<\/bB>]*\n* *[<bB>]*ter[<\/bB>]*\(5\)/<a href="master.5.html">$&<\/a>/g;
s/[<bB>]*mysql[<\/bBiI>]*_[<\/iIbB>]*table[<\/bB>]*\(5\)/<a href="mysql_table.5.html">$&<\/a>/g;
<ul>
-<li> <a href="#generics"> Generic mapping for outgoing SMTP mail </a>
+<li> <a href="#generic"> Generic mapping for outgoing SMTP mail </a>
</ul>
<td nowrap> all mail </td> <td> trivial-<br>rewrite(8) </td> <td>
relocated_maps </td> <td> none </td> </tr>
-<tr> <td> <a href="#generics"> Generics table </a> </td> <td>
-outgoing SMTP mail </td> <td> smtp(8) </td> <td> smtp_generics_maps
+<tr> <td> <a href="#generic"> Generic mapping table </a> </td> <td>
+outgoing SMTP mail </td> <td> smtp(8) </td> <td> smtp_generic_maps
</td> <td> none </td> </tr>
<tr> <td> <a href="#aliases"> Local alias database</a> </td> <td>
<ul>
-<li> <a href="#generics"> Generic mapping for outgoing SMTP mail </a>
+<li> <a href="#generic"> Generic mapping for outgoing SMTP mail </a>
</ul>
mail first, and then return it to the sender as undeliverable, with
the same reason. </p>
-<h3> <a name="generics"> Generic mapping for outgoing SMTP mail </a> </h3>
+<h3> <a name="generic"> Generic mapping for outgoing SMTP mail </a> </h3>
<p> Some hosts have no valid Internet domain name, and instead use
a name such as <i>localdomain.local</i>. This can be a problem when
you want to send mail over the Internet, because many mail servers
reject mail addresses with invalid domain names. </p>
-<p> With the smtp_generics_maps parameter you can specify generics(5)
+<p> With the smtp_generic_maps parameter you can specify generic(5)
lookup tables that replace local mail addresses by valid Internet
-addresses when mail leaves the machine via SMTP. The generics(5)
+addresses when mail leaves the machine via SMTP. The generic(5)
mapping replaces envelope and header addresses, and is non-recursive.
It does not happen when you send mail between addresses on the
local machine. </p>
<blockquote>
<pre>
/etc/postfix/main.cf:
- smtp_generics_maps = hash:/etc/postfix/generics
+ smtp_generic_maps = hash:/etc/postfix/generic
-/etc/postfix/generics:
+/etc/postfix/generic:
his@localdomain.local hisaccount@hisisp.example
her@localdomain.local heraccount@herisp.example
@localdomain.local hisaccount+local@hisisp.example
CONFIG = ../conf/access ../conf/aliases ../conf/canonical ../conf/relocated \
../conf/transport ../conf/virtual ../conf/header_checks \
- ../conf/generics
+ ../conf/generic
HTML = ../html/ADDRESS_CLASS_README.html \
../html/ADDRESS_REWRITING_README.html \
../conf/canonical: canonical
$(SRCTOMAN) - $? | $(AWK) | nroff -man | col -bx | uniq | sed 's/^/# /' >$@
-../conf/generics: generics
+../conf/generic: generic
$(SRCTOMAN) - $? | $(AWK) | nroff -man | col -bx | uniq | sed 's/^/# /' >$@
../conf/header_checks: header_checks
<h3>Postfix version 2.2 and later </h3>
-<p> Postfix 2.2 uses the generics(5) address mapping to replace
+<p> Postfix 2.2 uses the generic(5) address mapping to replace
local fantasy email addresses by valid Internet addresses. This
mapping happens ONLY when mail leaves the machine; not when you
send mail between users on the same machine. </p>
<blockquote>
<pre>
1 /etc/postfix/main.cf:
-2 smtp_generics_maps = hash:/etc/postfix/generics
+2 smtp_generic_maps = hash:/etc/postfix/generic
3
-4 /etc/postfix/generics:
+4 /etc/postfix/generic:
5 his@localdomain.local hisaccount@hisisp.example
6 her@localdomain.local heraccount@herisp.example
7 @localdomain.local hisaccount+local@hisisp.example
<b>dbm</b> files instead of <b>db</b> files. To find out what lookup
tables Postfix supports, use the command "<b>postconf -m</b>". </p>
-<p> Execute the command "<b>postmap /etc/postfix/generics</b>"
-whenever you change the generics table. </p>
+<p> Execute the command "<b>postmap /etc/postfix/generic</b>"
+whenever you change the generic table. </p>
<h3>Postfix version 2.1 and earlier </h3>
# propagate an address extension from the original address
# to the result. Specify zero or more of \fBcanonical\fR,
# \fBvirtual\fR, \fBalias\fR, \fBforward\fR, \fBinclude\fR,
-# or \fBgenerics\fR.
+# or \fBgeneric\fR.
# .IP \fBowner_request_special\fR
# Give special treatment to \fBowner-\fIlistname\fR and
# \fIlistname\fB-request\fR
# A list of address rewriting or forwarding mechanisms that propagate
# an address extension from the original address to the result.
# Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-# \fBforward\fR, \fBinclude\fR, or \fBgenerics\fR.
+# \fBforward\fR, \fBinclude\fR, or \fBgeneric\fR.
# .PP
# Other parameters of interest:
# .IP \fBinet_interfaces\fR
#++
# NAME
-# generics 5
+# generic 5
# SUMMARY
-# Postfix generics table format
+# Postfix generic table format
# SYNOPSIS
-# \fBpostmap /etc/postfix/generics\fR
+# \fBpostmap /etc/postfix/generic\fR
#
-# \fBpostmap -q "\fIstring\fB" /etc/postfix/generics\fR
+# \fBpostmap -q "\fIstring\fB" /etc/postfix/generic\fR
#
-# \fBpostmap -q - /etc/postfix/generics <\fIinputfile\fR
+# \fBpostmap -q - /etc/postfix/generic <\fIinputfile\fR
# DESCRIPTION
-# The optional \fBgenerics\fR(5) table specifies an address
+# The optional \fBgeneric\fR(5) table specifies an address
# mapping that applies when mail is delivered. This is the
# opposite of \fBcanonical\fR(5) mapping, which applies when
# mail is received.
#
-# Typically, one would use the \fBgenerics\fR(5) table on a
+# Typically, one would use the \fBgeneric\fR(5) table on a
# system that does not have a valid Internet domain name and
# that uses something like \fIlocaldomain.local\fR instead.
-# The \fBgenerics\fR(5) table is then used by the \fBsmtp\fR(8)
+# The \fBgeneric\fR(5) table is then used by the \fBsmtp\fR(8)
# client to transform local mail addresses into valid Internet
# mail addresses when mail has to be sent across the Internet.
# See the EXAMPLE section at the end of this document.
#
-# The \fBgenerics\fR(5) mapping affects both message header
+# The \fBgeneric\fR(5) mapping affects both message header
# addresses (i.e. addresses that appear inside messages) and
# message envelope addresses (for example, the addresses that
# are used in SMTP protocol commands).
#
-# Normally, the \fBgenerics\fR(5) table is specified as a
+# Normally, the \fBgeneric\fR(5) table is specified as a
# text file that serves as input to the \fBpostmap\fR(1)
# command. The result, an indexed file in \fBdbm\fR or
# \fBdb\fR format, is used for fast searching by the mail
-# system. Execute the command "\fBpostmap /etc/postfix/generics\fR"
+# system. Execute the command "\fBpostmap /etc/postfix/generic\fR"
# in order to rebuild the indexed file after changing the
# text file.
#
# .nf
# /etc/postfix/main.cf:
# .in +4
-# smtp_generics_maps = hash:/etc/postfix/generics
+# smtp_generic_maps = hash:/etc/postfix/generic
# .in -4
#
-# /etc/postfix/generics:
+# /etc/postfix/generic:
# .in +4
# his@localdomain.local hisaccount@hisisp.example
# her@localdomain.local heraccount@herisp.example
#
# .ad
# .fi
-# Execute the command "\fBpostmap /etc/postfix/generics\fR"
+# Execute the command "\fBpostmap /etc/postfix/generic\fR"
# whenever the table is changed. Instead of \fBhash\fR, some
# systems use \fBdbm\fR database files. To find out what
# tables your system supports use the command "\fBpostconf
# The following \fBmain.cf\fR parameters are especially relevant.
# The text below provides only a parameter summary. See
# \fBpostconf\fR(5) for more details including examples.
-# .IP \fBsmtp_generics_maps\fR
+# .IP \fBsmtp_generic_maps\fR
# Address mapping lookup table for envelope and header sender
# and recipient addresses while delivering mail via SMTP.
# .IP \fBpropagate_unmatched_extensions\fR
# A list of address rewriting or forwarding mechanisms that propagate
# an address extension from the original address to the result.
# Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-# \fBforward\fR, \fBinclude\fR, or \fBgenerics\fR.
+# \fBforward\fR, \fBinclude\fR, or \fBgeneric\fR.
# .PP
# Other parameters of interest:
# .IP \fBinet_interfaces\fR
<p>
Specify zero or more of <b>canonical</b>, <b>virtual</b>, <b>alias</b>,
-<b>forward</b>, <b>include</b> or <b>generics</b>. These cause
+<b>forward</b>, <b>include</b> or <b>generic</b>. These cause
address extension
propagation with canonical(5), virtual(5), and aliases(5) maps,
with local(8) .forward and :include: file lookups, and with smtp(8)
-generics maps, respectively. </p>
+generic maps, respectively. </p>
<p>
Note: enabling this feature for types other than <b>canonical</b>
<p> The SASL authentication security options that the Postfix SMTP
server uses for TLS encrypted SMTP sessions. </p>
-%PARAM smtp_generics_maps empty
+%PARAM smtp_generic_maps empty
<p> Optional lookup tables that perform address rewriting in the
SMTP client, typically to transform a locally valid address into
domain name, but uses something like <i>localdomain.local</i>
instead. </p>
-<p> The table format and lookups are documented in generics(5);
+<p> The table format and lookups are documented in generic(5);
examples are shown in the ADDRESS_REWRITING_README and
STANDARD_CONFIGURATION_README documents. </p>
domainname
download
firewalled
-generics
+generic
grep
hostname
html
# A list of address rewriting or forwarding mechanisms that propagate
# an address extension from the original address to the result.
# Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
-# \fBforward\fR, \fBinclude\fR, or \fBgenerics\fR.
+# \fBforward\fR, \fBinclude\fR, or \fBgeneric\fR.
# .PP
# Other parameters of interest:
# .IP \fBinet_interfaces\fR
post_mail_fputs(bounce, "");
if (bounce_info->flush == BOUNCE_MSG_FAIL) {
post_mail_fputs(bounce,
- "I'm sorry to have to inform you that your message could not be");
+ "I'm sorry to have to inform you that your message could not");
post_mail_fputs(bounce,
"be delivered to one or more recipients. It's attached below.");
} else if (bounce_info->flush == BOUNCE_MSG_WARN) {
/* .IP "include (EXT_PROP_INCLUDE)"
/* Propagate unmatched address extensions to the right-hand side
/* of :include: file entries.
-/* .IP "generics (EXT_PROP_GENERICS)"
+/* .IP "generic (EXT_PROP_GENERIC)"
/* Propagate unmatched address extensions to the right-hand side
-/* of smtp_generics_maps entries.
+/* of smtp_generic_maps entries.
/* DIAGNOSTICS
/* Panic: inappropriate use.
/* LICENSE
"alias", EXT_PROP_ALIAS,
"forward", EXT_PROP_FORWARD,
"include", EXT_PROP_INCLUDE,
- "generics", EXT_PROP_GENERICS,
+ "generic", EXT_PROP_GENERIC,
0,
};
#define EXT_PROP_ALIAS (1<<2)
#define EXT_PROP_FORWARD (1<<3)
#define EXT_PROP_INCLUDE (1<<4)
-#define EXT_PROP_GENERICS (1<<5)
+#define EXT_PROP_GENERIC (1<<5)
extern int ext_prop_mask(const char *, const char *);
#define DEF_SMTP_SEND_XFORWARD 0
extern bool var_smtp_send_xforward;
-#define VAR_SMTP_GENERICS_MAPS "smtp_generics_maps"
-#define DEF_SMTP_GENERICS_MAPS ""
-extern char *var_smtp_generics_maps;
+#define VAR_SMTP_GENERIC_MAPS "smtp_generic_maps"
+#define DEF_SMTP_GENERIC_MAPS ""
+extern char *var_smtp_generic_maps;
/*
* SMTP server. The soft error limit determines how many errors an SMTP
* Patches change the patchlevel and the release date. Snapshots change the
* release date only.
*/
-#define MAIL_RELEASE_DATE "20050210"
+#define MAIL_RELEASE_DATE "20050211"
#define MAIL_VERSION_NUMBER "2.2"
#define VAR_MAIL_VERSION "mail_version"
/* access(5), Postfix SMTP access control table
/* aliases(5), Postfix alias database
/* canonical(5), Postfix input address rewriting
-/* generics(5), Postfix output address rewriting
+/* generic(5), Postfix output address rewriting
/* header_checks(5), body_checks(5), Postfix content inspection
/* relocated(5), Users that have moved
/* transport(5), Postfix routing table
/* A case insensitive list of EHLO keywords (pipelining, starttls,
/* auth, etc.) that the SMTP client will ignore in the EHLO response
/* from a remote SMTP server.
-/* .IP "\fBsmtp_generics_maps (empty)\fR"
+/* .IP "\fBsmtp_generic_maps (empty)\fR"
/* Optional lookup tables that perform address rewriting in the
/* SMTP client, typically to transform a locally valid address into
/* a globally valid address when sending mail across the Internet.
bool var_smtp_tls_note_starttls_offer;
#endif
-char *var_smtp_generics_maps;
+char *var_smtp_generic_maps;
char *var_prop_extension;
/*
STRING_LIST *smtp_cache_dest;
SCACHE *smtp_scache;
MAPS *smtp_ehlo_dis_maps;
-MAPS *smtp_generics_maps;
+MAPS *smtp_generic_maps;
int smtp_ext_prop_mask;
#ifdef USE_TLS
DICT_FLAG_LOCK);
/*
- * Generics table.
+ * Generic maps.
*/
if (*var_prop_extension)
smtp_ext_prop_mask =
ext_prop_mask(VAR_PROP_EXTENSION, var_prop_extension);
- if (*var_smtp_generics_maps)
- smtp_generics_maps =
- maps_create(VAR_SMTP_GENERICS_MAPS, var_smtp_generics_maps,
+ if (*var_smtp_generic_maps)
+ smtp_generic_maps =
+ maps_create(VAR_SMTP_GENERIC_MAPS, var_smtp_generic_maps,
DICT_FLAG_LOCK);
}
VAR_SMTP_EHLO_DIS_MAPS, DEF_SMTP_EHLO_DIS_MAPS, &var_smtp_ehlo_dis_maps, 0, 0,
VAR_SMTP_TLS_PER_SITE, DEF_SMTP_TLS_PER_SITE, &var_smtp_tls_per_site, 0, 0,
VAR_PROP_EXTENSION, DEF_PROP_EXTENSION, &var_prop_extension, 0, 0,
- VAR_SMTP_GENERICS_MAPS, DEF_SMTP_GENERICS_MAPS, &var_smtp_generics_maps, 0, 0,
+ VAR_SMTP_GENERIC_MAPS, DEF_SMTP_GENERIC_MAPS, &var_smtp_generic_maps, 0, 0,
0,
};
static CONFIG_TIME_TABLE time_table[] = {
extern MAPS *smtp_ehlo_dis_maps; /* ehlo keyword filter */
-extern MAPS *smtp_generics_maps; /* make internal address valid */
+extern MAPS *smtp_generic_maps; /* make internal address valid */
extern int smtp_ext_prop_mask; /* address externsion propagation */
#ifdef USE_TLS
char *end_line;
/*
- * Rewrite primary header addresses that match the smtp_generics_table.
+ * Rewrite primary header addresses that match the smtp_generic_maps.
* The cleanup server already enforces that all headers have proper
* lengths and that all addresses are in proper form, so we don't have to
* repeat that.
+ strlen(header_info->name) + 1);
addr_list = tok822_grep(tree, TOK822_ADDR);
for (tpp = addr_list; *tpp; tpp++)
- did_rewrite |= smtp_map11_tree(tpp[0], smtp_generics_maps,
- smtp_ext_prop_mask & EXT_PROP_GENERICS);
+ did_rewrite |= smtp_map11_tree(tpp[0], smtp_generic_maps,
+ smtp_ext_prop_mask & EXT_PROP_GENERIC);
if (did_rewrite) {
vstring_sprintf(buf, "%s: ", header_info->name);
tok822_externalize(buf, tree, TOK822_STR_HEAD);
*/
#define REWRITE_ADDRESS(dst, src) do { \
vstring_strcpy(dst, src); \
- if (*(src) && smtp_generics_maps) \
- smtp_map11_internal(dst, smtp_generics_maps, \
- smtp_ext_prop_mask & EXT_PROP_GENERICS); \
+ if (*(src) && smtp_generic_maps) \
+ smtp_map11_internal(dst, smtp_generic_maps, \
+ smtp_ext_prop_mask & EXT_PROP_GENERIC); \
} while (0)
#define QUOTE_ADDRESS(dst, src) do { \
(var_disable_mime_oconv == 0
&& (session->features & SMTP_FEATURE_8BITMIME) == 0
&& strcmp(request->encoding, MAIL_ATTR_ENC_7BIT) != 0);
- if (downgrading || smtp_generics_maps)
+ if (downgrading || smtp_generic_maps)
session->mime_state = mime_state_alloc(MIME_OPT_DOWNGRADE
| MIME_OPT_REPORT_NESTING,
- smtp_generics_maps ?
+ smtp_generic_maps ?
smtp_header_rewrite :
smtp_header_out,
(MIME_STATE_ANY_END) 0,
/* with the specified session information.
/*
/* tls_scache_sequence() iterates over the specified TLS
-/* session cache and returns the first or next entry that
-/* matches the session timeout, OpenSSL version and flags
-/* restrictions. Entries that don't satisfy the requirements
+/* session cache and either returns the first or next entry
+/* that matches the session timeout, OpenSSL version and flags
+/* restrictions, or returns no data. Entries that don't
+/* satisfy the requirements
/* are silently deleted. Specify TLS_SCACHE_SEQUENCE_NOTHING
/* as the third and last argument to disable OpenSSL version
/* and flags restrictions, and to disable saving of cache
/* entry content or cache entry ID information. This is useful
-/* when purging expired entries.
+/* when purging expired entries. A result value of zero means
+/* that the end of the cache was reached.
/*
/* tls_scache_delete() removes the specified cache entry from
/* the specified TLS session cache.
* XXX Deleting entries while enumerating a map can he tricky. Some map
* types have a concept of cursor and support a "delete the current
* element" operation. Some map types without cursors don't behave well
- * when the current first/next entry is deleted (example: Berkeley DB <
- * 2). To avoid trouble, we delete an expired entry after advancing the
- * current first/next position beyond it, and ignore client requests to
- * delete the current entry.
+ * when the current first/next entry is deleted (example: with Berkeley
+ * DB < 2, the "next" operation produces garbage). To avoid trouble, we
+ * delete an expired entry after advancing the current first/next
+ * position beyond it, and ignore client requests to delete the current
+ * entry.
*/
/*
projects / thirdparty / postfix.git / commitdiff
