From 34f6c91a68d4a551ed8563af246ed5617eed49cf Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Fri, 11 Feb 2005 00:00:00 -0500 Subject: [PATCH] postfix-2.2-20050211 --- postfix/COMPATIBILITY | 2 +- postfix/HISTORY | 28 +++++++---- postfix/README_FILES/ADDRESS_REWRITING_README | 14 +++--- .../STANDARD_CONFIGURATION_README | 10 ++-- postfix/RELEASE_NOTES | 14 ++++-- postfix/conf/aliases | 2 +- postfix/conf/canonical | 2 +- postfix/conf/{generics => generic} | 46 +++++++++--------- postfix/conf/postfix-files | 9 ++-- postfix/conf/virtual | 2 +- postfix/html/ADDRESS_REWRITING_README.html | 18 +++---- postfix/html/Makefile.in | 4 +- .../html/STANDARD_CONFIGURATION_README.html | 10 ++-- postfix/html/aliases.5.html | 2 +- postfix/html/canonical.5.html | 2 +- .../html/{generics.5.html => generic.5.html} | 48 +++++++++---------- postfix/html/postconf.5.html | 8 ++-- postfix/html/postfix-manuals.html | 2 +- postfix/html/postfix.1.html | 2 +- postfix/html/smtp.8.html | 2 +- postfix/html/virtual.5.html | 2 +- postfix/man/Makefile.in | 4 +- postfix/man/man1/postfix.1 | 2 +- postfix/man/man5/aliases.5 | 2 +- postfix/man/man5/canonical.5 | 2 +- postfix/man/man5/{generics.5 => generic.5} | 34 ++++++------- postfix/man/man5/postconf.5 | 8 ++-- postfix/man/man5/virtual.5 | 2 +- postfix/man/man8/smtp.8 | 2 +- postfix/mantools/manlint.stop | 8 ++-- postfix/mantools/postlink | 4 +- postfix/proto/ADDRESS_REWRITING_README.html | 18 +++---- postfix/proto/Makefile.in | 4 +- .../proto/STANDARD_CONFIGURATION_README.html | 10 ++-- postfix/proto/aliases | 2 +- postfix/proto/canonical | 2 +- postfix/proto/{generics => generic} | 32 ++++++------- postfix/proto/postconf.proto | 8 ++-- postfix/proto/stop | 2 +- postfix/proto/virtual | 2 +- postfix/src/bounce/bounce_notify_util.c | 2 +- postfix/src/global/ext_prop.c | 6 +-- postfix/src/global/ext_prop.h | 2 +- postfix/src/global/mail_params.h | 6 +-- postfix/src/global/mail_version.h | 2 +- postfix/src/postfix/postfix.c | 2 +- postfix/src/smtp/smtp.c | 16 +++---- postfix/src/smtp/smtp.h | 2 +- postfix/src/smtp/smtp_proto.c | 16 +++---- postfix/src/tls/tls_scache.c | 19 ++++---- 50 files changed, 235 insertions(+), 215 deletions(-) rename postfix/conf/{generics => generic} (86%) rename postfix/html/{generics.5.html => generic.5.html} (84%) rename postfix/man/man5/{generics.5 => generic.5} (90%) rename postfix/proto/{generics => generic} (90%) diff --git a/postfix/COMPATIBILITY b/postfix/COMPATIBILITY index 4ee0668de..f0c27f2e0 100644 --- a/postfix/COMPATIBILITY +++ b/postfix/COMPATIBILITY @@ -18,7 +18,7 @@ esmtp yes 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 diff --git a/postfix/HISTORY b/postfix/HISTORY index 0f56857b0..0c03540b5 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -10274,7 +10274,7 @@ Apologies for any names omitted. 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 @@ -10288,7 +10288,7 @@ Apologies for any names omitted. 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. @@ -10324,17 +10324,17 @@ Apologies for any names omitted. 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 @@ -10346,17 +10346,25 @@ Apologies for any names omitted. 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. diff --git a/postfix/README_FILES/ADDRESS_REWRITING_README b/postfix/README_FILES/ADDRESS_REWRITING_README index d3f3e0f45..b91a9a725 100644 --- a/postfix/README_FILES/ADDRESS_REWRITING_README +++ b/postfix/README_FILES/ADDRESS_REWRITING_README @@ -160,9 +160,9 @@ table will help you to quickly find what you need. |users table |all mail|rewrite |relocated_maps |none | | | |(8) | | | |_ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ | - |Generics |outgoing| | | | - |table |SMTP |smtp(8) |smtp_generics_maps |none | - | |mail | | | | + |Generic |outgoing| | | | + |mapping |SMTP |smtp(8) |smtp_generic_maps |none | + |table |mail | | | | |_ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ | |Local alias |all mail|local(8)|alias_maps |none | |database | | | | | @@ -607,9 +607,9 @@ localdomain.local. 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. -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. @@ -618,9 +618,9 @@ This feature is available in Postfix version 2.2 and later. 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 diff --git a/postfix/README_FILES/STANDARD_CONFIGURATION_README b/postfix/README_FILES/STANDARD_CONFIGURATION_README index fc4dd6ce8..627ca056d 100644 --- a/postfix/README_FILES/STANDARD_CONFIGURATION_README +++ b/postfix/README_FILES/STANDARD_CONFIGURATION_README @@ -517,7 +517,7 @@ Postfix version you have, execute the command "ppoossttccoonnff mmaai PPoossttffiixx vveerrssiioonn 22..22 aanndd llaatteerr -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. @@ -526,9 +526,9 @@ this with basic configuration information as discussed the first half of this 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 @@ -546,8 +546,8 @@ When mail is sent to a remote host via SMTP: Specify ddbbmm instead of hhaasshh if your system uses ddbbmm files instead of ddbb files. To find out what lookup tables Postfix supports, use the command "ppoossttccoonnff --mm". -Execute the command "ppoossttmmaapp //eettcc//ppoossttffiixx//ggeenneerriiccss" whenever you change the -generics table. +Execute the command "ppoossttmmaapp //eettcc//ppoossttffiixx//ggeenneerriicc" whenever you change the +generic table. PPoossttffiixx vveerrssiioonn 22..11 aanndd eeaarrlliieerr diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 6a1e12144..a4d2ff29b 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -7,6 +7,12 @@ snapshot release). Patches are issued for the official release 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 ================================================ @@ -28,18 +34,18 @@ for sites that have no valid Internet domain name, and that use a 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 diff --git a/postfix/conf/aliases b/postfix/conf/aliases index b13f4047c..6738a155d 100644 --- a/postfix/conf/aliases +++ b/postfix/conf/aliases @@ -181,7 +181,7 @@ decode: root # 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- diff --git a/postfix/conf/canonical b/postfix/conf/canonical index 2d3e2b06c..9f245bc35 100644 --- a/postfix/conf/canonical +++ b/postfix/conf/canonical @@ -180,7 +180,7 @@ # 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: # diff --git a/postfix/conf/generics b/postfix/conf/generic similarity index 86% rename from postfix/conf/generics rename to postfix/conf/generic index 0a77b3b99..101d304a4 100644 --- a/postfix/conf/generics +++ b/postfix/conf/generic @@ -1,39 +1,39 @@ -# 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 @@ -343,8 +343,8 @@ nowrap> all mail cleanup(8) < all mail trivial-
rewrite(8) relocated_maps none - Generics table -outgoing SMTP mail smtp(8) smtp_generics_maps + Generic mapping table +outgoing SMTP mail smtp(8) smtp_generic_maps none Local alias database @@ -819,7 +819,7 @@ via the smtp(8) delivery agent:

@@ -939,16 +939,16 @@ otheruser@elsewhere.tld". Older Postfix versions will receive the mail first, and then return it to the sender as undeliverable, with the same reason.

-

Generic mapping for outgoing SMTP mail

+

Generic mapping for outgoing SMTP mail

Some hosts have no valid Internet domain name, and instead use a name such as localdomain.local. 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.

-

With the smtp_generics_maps parameter you can specify generics(5) +

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.

@@ -960,9 +960,9 @@ local machine. 

 /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
diff --git a/postfix/html/Makefile.in b/postfix/html/Makefile.in
index 39dd1a732..139345aed 100644
--- a/postfix/html/Makefile.in
+++ b/postfix/html/Makefile.in
@@ -18,7 +18,7 @@ CONFIG	= access.5.html aliases.5.html canonical.5.html relocated.5.html \
 	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)\"`"
@@ -241,7 +241,7 @@ header_checks.5.html: ../proto/header_checks
 	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 >$@
 
diff --git a/postfix/html/STANDARD_CONFIGURATION_README.html b/postfix/html/STANDARD_CONFIGURATION_README.html
index 9c2aaf454..b73113ff4 100644
--- a/postfix/html/STANDARD_CONFIGURATION_README.html
+++ b/postfix/html/STANDARD_CONFIGURATION_README.html
@@ -707,7 +707,7 @@ To find out what Postfix version you have, execute the command
 
 
Postfix version 2.2 and later 

 
-
 Postfix 2.2 uses the generics(5) address mapping to replace
+
 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. 

@@ -719,9 +719,9 @@ discussed the first half of this 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
@@ -748,8 +748,8 @@ that the ISP supports "+" style address extensions). 

 dbm files instead of db files. To find out what lookup
 tables Postfix supports, use the command "postconf -m".  

 
-
 Execute the command "postmap /etc/postfix/generics"
-whenever you change the generics table. 

+
 Execute the command "postmap /etc/postfix/generic"
+whenever you change the generic table. 

 
 
Postfix version 2.1 and earlier 

 
diff --git a/postfix/html/aliases.5.html b/postfix/html/aliases.5.html
index 38f242c58..ddb7649e5 100644
--- a/postfix/html/aliases.5.html
+++ b/postfix/html/aliases.5.html
@@ -149,7 +149,7 @@ ALIASES(5)                                             ALIASES(5)
               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-
diff --git a/postfix/html/canonical.5.html b/postfix/html/canonical.5.html
index e56d9a75e..38cef8db6 100644
--- a/postfix/html/canonical.5.html
+++ b/postfix/html/canonical.5.html
@@ -186,7 +186,7 @@ CANONICAL(5)                                         CANONICAL(5)
               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:
 
diff --git a/postfix/html/generics.5.html b/postfix/html/generic.5.html
similarity index 84%
rename from postfix/html/generics.5.html
rename to postfix/html/generic.5.html
index 33b466f70..e0e0138e5 100644
--- a/postfix/html/generics.5.html
+++ b/postfix/html/generic.5.html
@@ -2,44 +2,44 @@
         "http://www.w3.org/TR/html4/loose.dtd">
  
 
- Postfix manual - generics(5) 
+ Postfix manual - generic(5) 
   
-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,
@@ -155,14 +155,14 @@ GENERICS(5)                                           GENERICS(5)
        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".
@@ -175,7 +175,7 @@ GENERICS(5)                                           GENERICS(5)
        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.
@@ -185,7 +185,7 @@ GENERICS(5)                                           GENERICS(5)
               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:
 
@@ -234,5 +234,5 @@ GENERICS(5)                                           GENERICS(5)
        P.O. Box 704
        Yorktown Heights, NY 10598, USA
 
-                                                      GENERICS(5)
+                                                       GENERIC(5)
 
  
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index f78f41b1e..382ecee9d 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -4536,11 +4536,11 @@ to "joe.user+foo".
 
 

 Specify zero or more of canonical, virtual, alias,
-forward, include or generics. These cause
+forward, include or generic. 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.  

+generic maps, respectively.  

 
 

 Note: enabling this feature for types other than canonical
@@ -5915,7 +5915,7 @@ send all their email to a dedicated mailhub.  

 
 
 
-
smtp_generics_maps
+
smtp_generic_maps
 (default: empty)

 
 
 Optional lookup tables that perform address rewriting in the
@@ -5925,7 +5925,7 @@ This is needed when the local machine does not have its own Internet
 domain name, but uses something like localdomain.local
 instead.  

 
-
 The table format and lookups are documented in generics(5);
+
 The table format and lookups are documented in generic(5);
 examples are shown in the ADDRESS_REWRITING_README and
 STANDARD_CONFIGURATION_README documents. 

 
diff --git a/postfix/html/postfix-manuals.html b/postfix/html/postfix-manuals.html
index 333f02f9d..042ee6502 100644
--- a/postfix/html/postfix-manuals.html
+++ b/postfix/html/postfix-manuals.html
@@ -128,7 +128,7 @@ the following convention:  

 
 
  •  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 
 
diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html
index 572abb000..a5241383c 100644
--- a/postfix/html/postfix.1.html
+++ b/postfix/html/postfix.1.html
@@ -216,7 +216,7 @@ POSTFIX(1)                                             POSTFIX(1)
        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
diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html
index 82d6801c8..e9dae91d1 100644
--- a/postfix/html/smtp.8.html
+++ b/postfix/html/smtp.8.html
@@ -150,7 +150,7 @@ SMTP(8)                                                   SMTP(8)
               will ignore in the EHLO response from a remote SMTP
               server.
 
-       smtp_generics_maps (empty)
+       smtp_generic_maps (empty)
               Optional lookup tables that perform address rewrit-
               ing in the SMTP client, typically  to  transform  a
               locally valid address into a globally valid address
diff --git a/postfix/html/virtual.5.html b/postfix/html/virtual.5.html
index c5f42cdd5..164b39bfe 100644
--- a/postfix/html/virtual.5.html
+++ b/postfix/html/virtual.5.html
@@ -231,7 +231,7 @@ VIRTUAL(5)                                             VIRTUAL(5)
               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:
 
diff --git a/postfix/man/Makefile.in b/postfix/man/Makefile.in
index 7987737e2..c860e8e74 100644
--- a/postfix/man/Makefile.in
+++ b/postfix/man/Makefile.in
@@ -17,7 +17,7 @@ CONFIG	= man5/access.5 man5/aliases.5 man5/canonical.5 man5/relocated.5 \
 	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
 
@@ -241,7 +241,7 @@ man5/canonical.5: ../proto/canonical
 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
diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1
index ac150d4b7..0e99c558d 100644
--- a/postfix/man/man1/postfix.1
+++ b/postfix/man/man1/postfix.1
@@ -182,7 +182,7 @@ Table-driven mechanisms:
 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
diff --git a/postfix/man/man5/aliases.5 b/postfix/man/man5/aliases.5
index 30297e87f..bd70ee64b 100644
--- a/postfix/man/man5/aliases.5
+++ b/postfix/man/man5/aliases.5
@@ -138,7 +138,7 @@ 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.
+or \fBgeneric\fR.
 .IP \fBowner_request_special\fR
 Give special treatment to \fBowner-\fIlistname\fR and
 \fIlistname\fB-request\fR
diff --git a/postfix/man/man5/canonical.5 b/postfix/man/man5/canonical.5
index 8dd791b49..36ce43938 100644
--- a/postfix/man/man5/canonical.5
+++ b/postfix/man/man5/canonical.5
@@ -185,7 +185,7 @@ addresses.
 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
diff --git a/postfix/man/man5/generics.5 b/postfix/man/man5/generic.5
similarity index 90%
rename from postfix/man/man5/generics.5
rename to postfix/man/man5/generic.5
index 633a2a11f..c71cdc73d 100644
--- a/postfix/man/man5/generics.5
+++ b/postfix/man/man5/generic.5
@@ -1,44 +1,44 @@
-.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.
 
@@ -166,10 +166,10 @@ that the ISP supports "+" style address extensions).
 .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
@@ -178,7 +178,7 @@ that the ISP supports "+" style address extensions).
 
 .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
@@ -195,14 +195,14 @@ The table format does not understand quoting conventions.
 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
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index 360ca6432..73e5ec985 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -2438,11 +2438,11 @@ joe.user\fR", the address "\fIjoe+foo@domain\fR" would rewrite
 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
@@ -3246,7 +3246,7 @@ This option is useful only if you are definitely sure that you
 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.
@@ -3254,7 +3254,7 @@ This is needed when the local machine does not have its own 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
diff --git a/postfix/man/man5/virtual.5 b/postfix/man/man5/virtual.5
index c83ea011f..c2851b8b2 100644
--- a/postfix/man/man5/virtual.5
+++ b/postfix/man/man5/virtual.5
@@ -238,7 +238,7 @@ as the \fBmydestination\fR parameter.
 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
diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8
index e28385edd..136b509a8 100644
--- a/postfix/man/man8/smtp.8
+++ b/postfix/man/man8/smtp.8
@@ -140,7 +140,7 @@ from a remote SMTP server.
 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.
diff --git a/postfix/mantools/manlint.stop b/postfix/mantools/manlint.stop
index c12d146ce..5ff67a674 100644
--- a/postfix/mantools/manlint.stop
+++ b/postfix/mantools/manlint.stop
@@ -105,9 +105,9 @@ man/man8/qmgr.8:55:.IP \fBbounce\fR
 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 
diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink
index d7d5499da..0c931ff0e 100755
--- a/postfix/mantools/postlink
+++ b/postfix/mantools/postlink
@@ -324,7 +324,7 @@ while (<>) {
     s;\bsmtp_data_init_timeout\b;$&;g;
     s;\bsmtp_data_xfer_timeout\b;$&;g;
     s;\bsmtp_defer_if_no_mx_address_found\b;$&;g;
-    s;\bsmtp_generics_maps\b;$&;g;
+    s;\bsmtp_generic_maps\b;$&;g;
     s;\blmtp_destination_concurrency_limit\b;$&;g;
     s;\blmtp_destination_recip[-]*\n* *[]*ient_limit\b;$&;g;
     s;\brelay_destination_concurrency_limit\b;$&;g;
@@ -552,7 +552,7 @@ while (<>) {
     s/[]*access[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*aliases[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*canonical[<\/bB>]*\(5\)/$&<\/a>/g;
-    s/[]*gener[-<\/bB>]*\n* *[]*ics[<\/bB>]*\(5\)/$&<\/a>/g;
+    s/[]*gener[-<\/bB>]*\n* *[]*ic[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*ldap[<\/bBiI>]*_[<\/iIbB>]*table[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*mas[-<\/bB>]*\n* *[]*ter[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*mysql[<\/bBiI>]*_[<\/iIbB>]*table[<\/bB>]*\(5\)/$&<\/a>/g;
diff --git a/postfix/proto/ADDRESS_REWRITING_README.html b/postfix/proto/ADDRESS_REWRITING_README.html
index 83b4ad834..3b8560b4c 100644
--- a/postfix/proto/ADDRESS_REWRITING_README.html
+++ b/postfix/proto/ADDRESS_REWRITING_README.html
@@ -100,7 +100,7 @@ as invalid 
 
 
 
@@ -343,8 +343,8 @@ transport_maps   none  
  all mail   trivial-
    rewrite(8)  
 relocated_maps   none  
 
-   Generics table   
-outgoing SMTP mail   smtp(8)   smtp_generics_maps
+   Generic mapping table   
+outgoing SMTP mail   smtp(8)   smtp_generic_maps
   none  
 
    Local alias database  
@@ -819,7 +819,7 @@ via the smtp(8) delivery agent: 
    
 
 
 
@@ -939,16 +939,16 @@ otheruser@elsewhere.tld". Older Postfix versions will receive the
 mail first, and then return it to the sender as undeliverable, with
 the same reason.  
    
 
-
      Generic mapping for outgoing SMTP mail  
    
+
      Generic mapping for outgoing SMTP mail  
    
 
 
     Some hosts have no valid Internet domain name, and instead use
 a name such as localdomain.local. 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. 
    
 
-
     With the smtp_generics_maps parameter you can specify generics(5)
+
     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. 
    
@@ -960,9 +960,9 @@ local machine. 
    
 
    
 
     /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
diff --git a/postfix/proto/Makefile.in b/postfix/proto/Makefile.in
index 7656e0114..a5c845342 100644
--- a/postfix/proto/Makefile.in
+++ b/postfix/proto/Makefile.in
@@ -4,7 +4,7 @@ SHELL	= /bin/sh
 
 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 \
@@ -105,7 +105,7 @@ clobber:
 ../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
diff --git a/postfix/proto/STANDARD_CONFIGURATION_README.html b/postfix/proto/STANDARD_CONFIGURATION_README.html
index eb7c5f58b..16553c3b1 100644
--- a/postfix/proto/STANDARD_CONFIGURATION_README.html
+++ b/postfix/proto/STANDARD_CONFIGURATION_README.html
@@ -707,7 +707,7 @@ To find out what Postfix version you have, execute the command
 
 
    Postfix version 2.2 and later 
    
 
-
     Postfix 2.2 uses the generics(5) address mapping to replace
+
     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. 
    
@@ -719,9 +719,9 @@ discussed the first half of this 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
@@ -748,8 +748,8 @@ that the ISP supports "+" style address extensions). 
    
 dbm files instead of db files. To find out what lookup
 tables Postfix supports, use the command "postconf -m".  
    
 
-
     Execute the command "postmap /etc/postfix/generics"
-whenever you change the generics table. 
    
+
     Execute the command "postmap /etc/postfix/generic"
+whenever you change the generic table. 
    
 
 
    Postfix version 2.1 and earlier 
    
 
diff --git a/postfix/proto/aliases b/postfix/proto/aliases
index b2a690785..8a499a416 100644
--- a/postfix/proto/aliases
+++ b/postfix/proto/aliases
@@ -126,7 +126,7 @@
 #	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
diff --git a/postfix/proto/canonical b/postfix/proto/canonical
index 81d3ad381..2d7f17b72 100644
--- a/postfix/proto/canonical
+++ b/postfix/proto/canonical
@@ -163,7 +163,7 @@
 #	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
diff --git a/postfix/proto/generics b/postfix/proto/generic
similarity index 90%
rename from postfix/proto/generics
rename to postfix/proto/generic
index 648815d1d..97a847dfc 100644
--- a/postfix/proto/generics
+++ b/postfix/proto/generic
@@ -1,38 +1,38 @@
 #++
 # 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.
 #
@@ -146,10 +146,10 @@
 # .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
@@ -158,7 +158,7 @@
 #
 # .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
@@ -171,14 +171,14 @@
 #	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
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 8009bd1ba..430ba604c 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -2760,11 +2760,11 @@ to "joe.user+foo".
 
 
    
 Specify zero or more of canonical, virtual, alias,
-forward, include or generics. These cause
+forward, include or generic. 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.  
    
+generic maps, respectively.  
    
 
 
    
 Note: enabling this feature for types other than canonical
@@ -8251,7 +8251,7 @@ client uses for TLS encrypted SMTP sessions. 
    
 
     The SASL authentication security options that the Postfix SMTP
 server uses for TLS encrypted SMTP sessions. 
    
 
-%PARAM smtp_generics_maps empty
+%PARAM smtp_generic_maps empty
 
 
     Optional lookup tables that perform address rewriting in the
 SMTP client, typically to transform a locally valid address into
@@ -8260,7 +8260,7 @@ This is needed when the local machine does not have its own Internet
 domain name, but uses something like localdomain.local
 instead.  
    
 
-
     The table format and lookups are documented in generics(5);
+
     The table format and lookups are documented in generic(5);
 examples are shown in the ADDRESS_REWRITING_README and
 STANDARD_CONFIGURATION_README documents. 
    
 
diff --git a/postfix/proto/stop b/postfix/proto/stop
index ce0a2713d..19c7c32d7 100644
--- a/postfix/proto/stop
+++ b/postfix/proto/stop
@@ -20,7 +20,7 @@ dns
 domainname
 download
 firewalled
-generics
+generic
 grep
 hostname
 html
diff --git a/postfix/proto/virtual b/postfix/proto/virtual
index b4e7cf30a..cf28b83d4 100644
--- a/postfix/proto/virtual
+++ b/postfix/proto/virtual
@@ -214,7 +214,7 @@
 #	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
diff --git a/postfix/src/bounce/bounce_notify_util.c b/postfix/src/bounce/bounce_notify_util.c
index 205d2e453..c4138a388 100644
--- a/postfix/src/bounce/bounce_notify_util.c
+++ b/postfix/src/bounce/bounce_notify_util.c
@@ -460,7 +460,7 @@ int     bounce_boilerplate(VSTREAM *bounce, BOUNCE_INFO *bounce_info)
     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) {
diff --git a/postfix/src/global/ext_prop.c b/postfix/src/global/ext_prop.c
index fac9b6661..c6860cf2b 100644
--- a/postfix/src/global/ext_prop.c
+++ b/postfix/src/global/ext_prop.c
@@ -31,9 +31,9 @@
 /* .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
@@ -70,7 +70,7 @@ int     ext_prop_mask(const char *param_name, const char *pattern)
 	"alias", EXT_PROP_ALIAS,
 	"forward", EXT_PROP_FORWARD,
 	"include", EXT_PROP_INCLUDE,
-	"generics", EXT_PROP_GENERICS,
+	"generic", EXT_PROP_GENERIC,
 	0,
     };
 
diff --git a/postfix/src/global/ext_prop.h b/postfix/src/global/ext_prop.h
index 4d7ef1e18..01f0ea088 100644
--- a/postfix/src/global/ext_prop.h
+++ b/postfix/src/global/ext_prop.h
@@ -19,7 +19,7 @@
 #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 *);
 
diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index f6c089296..ebce57eaa 100644
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -969,9 +969,9 @@ extern bool var_smtp_defer_mxaddr;
 #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
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 5cfbb0730..05ed68614 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * 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"
diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c
index d502db114..ac0df3799 100644
--- a/postfix/src/postfix/postfix.c
+++ b/postfix/src/postfix/postfix.c
@@ -168,7 +168,7 @@
 /*	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
diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c
index 79fc03615..b0bbf70ff 100644
--- a/postfix/src/smtp/smtp.c
+++ b/postfix/src/smtp/smtp.c
@@ -122,7 +122,7 @@
 /*	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.
@@ -495,7 +495,7 @@ int     var_smtp_tls_scert_vd;
 bool    var_smtp_tls_note_starttls_offer;
 #endif
 
-char   *var_smtp_generics_maps;
+char   *var_smtp_generic_maps;
 char   *var_prop_extension;
 
  /*
@@ -507,7 +507,7 @@ int     smtp_host_lookup_mask;
 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
@@ -682,14 +682,14 @@ static void pre_init(char *unused_name, char **unused_argv)
 					 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);
 }
 
@@ -740,7 +740,7 @@ int     main(int argc, char **argv)
 	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[] = {
diff --git a/postfix/src/smtp/smtp.h b/postfix/src/smtp/smtp.h
index 8b52009ca..53d918656 100644
--- a/postfix/src/smtp/smtp.h
+++ b/postfix/src/smtp/smtp.h
@@ -155,7 +155,7 @@ extern STRING_LIST *smtp_cache_dest;	/* cached destinations */
 
 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
diff --git a/postfix/src/smtp/smtp_proto.c b/postfix/src/smtp/smtp_proto.c
index 30ad1c1fb..31d02a7d8 100644
--- a/postfix/src/smtp/smtp_proto.c
+++ b/postfix/src/smtp/smtp_proto.c
@@ -740,7 +740,7 @@ static void smtp_header_rewrite(void *context, int header_class,
     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.
@@ -755,8 +755,8 @@ static void smtp_header_rewrite(void *context, int header_class,
 			    + 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);
@@ -838,9 +838,9 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state,
      */
 #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 { \
@@ -1349,10 +1349,10 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state,
 		(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,
diff --git a/postfix/src/tls/tls_scache.c b/postfix/src/tls/tls_scache.c
index e679d049e..e3144e865 100644
--- a/postfix/src/tls/tls_scache.c
+++ b/postfix/src/tls/tls_scache.c
@@ -75,14 +75,16 @@
 /*	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.
@@ -454,10 +456,11 @@ int     tls_scache_sequence(TLS_SCACHE *cp, int first_next,
      * 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.
      */
 
     /*
-- 
2.47.3