Prereq: "2.5.5"
diff -cr --new-file /var/tmp/postfix-2.5.5/src/global/mail_version.h ./src/global/mail_version.h
*** /var/tmp/postfix-2.5.5/src/global/mail_version.h	Fri Aug 29 14:25:23 2008
--- ./src/global/mail_version.h	Sat Jan  3 20:27:10 2009
***************
*** 20,27 ****
    * Patches change both the patchlevel and the release date. Snapshots have no
    * patchlevel; they change the release date only.
    */
! #define MAIL_RELEASE_DATE	"20080902"
! #define MAIL_VERSION_NUMBER	"2.5.5"
  
  #ifdef SNAPSHOT
  # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
--- 20,27 ----
    * Patches change both the patchlevel and the release date. Snapshots have no
    * patchlevel; they change the release date only.
    */
! #define MAIL_RELEASE_DATE	"20090103"
! #define MAIL_VERSION_NUMBER	"2.5.6"
  
  #ifdef SNAPSHOT
  # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff -cr --new-file /var/tmp/postfix-2.5.5/HISTORY ./HISTORY
*** /var/tmp/postfix-2.5.5/HISTORY	Sun Aug 31 19:43:44 2008
--- ./HISTORY	Sat Jan  3 20:25:35 2009
***************
*** 13248,13254 ****
  	cleanup/cleanup_final.c, cleanup/cleanup_bounce.c,
  	cleanup/cleanup_api.c.
  
! 20050217
  
  	Streamline the compile time selection of event handling
  	styles, replacing multiple on/off macros by just one
--- 13248,13254 ----
  	cleanup/cleanup_final.c, cleanup/cleanup_bounce.c,
  	cleanup/cleanup_api.c.
  
! 20070217
  
  	Streamline the compile time selection of event handling
  	styles, replacing multiple on/off macros by just one
***************
*** 14441,14443 ****
--- 14441,14471 ----
  	implement a denial of service attack on Postfix. Data
  	confidentiality and integrity are not affected.  File:
  	util/events.c.
+ 
+ 20081022
+ 
+ 	Documentation: removed inapplicable daemon_timeout reference
+ 	from qmgr(8), oqmgr(8), pickup(8). These daemons need to
+ 	use a much shorter watchdog timer.
+ 
+ 20081108
+ 
+ 	Bugfix (introduced Postfix 2.5): the Postfix SMTP server
+ 	did not ask for a client certificate with "smtpd_tls_req_ccert
+ 	= yes". Reported by Rob Foehl. File: smtpd/smtpd.c.
+ 
+ 20081126
+ 
+ 	Documentation: pcre_table(5) incorrectly claimed that the
+ 	'x' flag supports #comment after text. File: proto/pcre_table.
+ 
+ 20081203
+ 
+ 	Cleanup: adjust the VSTREAM buffer strategy when reusing
+ 	an SMTP connection with a large TCP MSS value. File:
+ 	smtp/smtp_reuse.c.
+ 
+ 20081222
+ 
+ 	Documentation: log the "*" pattern as the last transport
+ 	map lookup. File: proto/transport.
diff -cr --new-file /var/tmp/postfix-2.5.5/conf/transport ./conf/transport
*** /var/tmp/postfix-2.5.5/conf/transport	Mon Jun  4 19:49:33 2007
--- ./conf/transport	Sat Jan  3 20:20:04 2009
***************
*** 121,203 ****
  #               ting.   Otherwise, a domain name matches itself and
  #               its subdomains.
  # 
! #        Note 1: the special pattern * represents any address (i.e.
! #        it functions as the wild-card pattern).
  # 
! #        Note  2:  the  null  recipient  address  is  looked  up as
  #        $empty_address_recipient@$myhostname (default: mailer-dae-
  #        mon@hostname).
  # 
! #        Note  3:  user@domain  or  user+extension@domain lookup is
  #        available in Postfix 2.0 and later.
  # 
  # RESULT FORMAT
! #        The lookup result is of the form  transport:nexthop.   The
! #        transport  field  specifies a mail delivery transport such
! #        as smtp or local. The nexthop field  specifies  where  and
  #        how to deliver mail.
  # 
! #        The  transport field specifies the name of a mail delivery
  #        transport (the first name of a mail delivery service entry
  #        in the Postfix master.cf file).
  # 
! #        The  interpretation  of  the  nexthop  field  is transport
! #        dependent. In the case of SMTP, specify  a  service  on  a
! #        non-default  port  as  host:service,  and disable MX (mail
! #        exchanger) DNS lookups with [host] or [host]:port. The  []
  #        form is required when you specify an IP address instead of
  #        a hostname.
  # 
! #        A null transport and null nexthop  result  means  "do  not
! #        change":  use  the delivery transport and nexthop informa-
! #        tion that would be used when the  entire  transport  table
  #        did not exist.
  # 
! #        A  non-null  transport  field  with  a  null nexthop field
  #        resets the nexthop information to the recipient domain.
  # 
! #        A null transport field with non-null  nexthop  field  does
  #        not modify the transport information.
  # 
  # EXAMPLES
! #        In  order to deliver internal mail directly, while using a
! #        mail relay for all other mail, specify a  null  entry  for
! #        internal  destinations  (do not change the delivery trans-
! #        port or the nexthop information) and  specify  a  wildcard
  #        for all other destinations.
  # 
  #             my.domain    :
  #             .my.domain   :
  #             *            smtp:outbound-relay.my.domain
  # 
! #        In  order  to send mail for example.com and its subdomains
  #        via the uucp transport to the UUCP host named example:
  # 
  #             example.com      uucp:example
  #             .example.com     uucp:example
  # 
! #        When no nexthop host name is  specified,  the  destination
! #        domain  name  is  used instead. For example, the following
! #        directs mail for user@example.com via the  slow  transport
! #        to  a  mail exchanger for example.com.  The slow transport
  #        could be configured to run at most one delivery process at
  #        a time:
  # 
  #             example.com      slow:
  # 
  #        When no transport is specified, Postfix uses the transport
! #        that matches the address  domain  class  (see  DESCRIPTION
! #        above).   The following sends all mail for example.com and
  #        its subdomains to host gateway.example.com:
  # 
  #             example.com      :[gateway.example.com]
  #             .example.com     :[gateway.example.com]
  # 
! #        In the above example, the [] suppress  MX  lookups.   This
! #        prevents  mail  routing loops when your machine is primary
  #        MX host for example.com.
  # 
! #        In the case of delivery via SMTP, one  may  specify  host-
  #        name:service instead of just a host:
  # 
  #             example.com      smtp:bar.example:2025
--- 121,205 ----
  #               ting.   Otherwise, a domain name matches itself and
  #               its subdomains.
  # 
! #        * transport:nexthop
! #               The special pattern * represents any address  (i.e.
! #               it  functions  as  the  wild-card  pattern,  and is
! #               unique to Postfix transport tables).
  # 
! #        Note 1:  the  null  recipient  address  is  looked  up  as
  #        $empty_address_recipient@$myhostname (default: mailer-dae-
  #        mon@hostname).
  # 
! #        Note 2: user@domain  or  user+extension@domain  lookup  is
  #        available in Postfix 2.0 and later.
  # 
  # RESULT FORMAT
! #        The  lookup  result is of the form transport:nexthop.  The
! #        transport field specifies a mail delivery  transport  such
! #        as  smtp  or  local. The nexthop field specifies where and
  #        how to deliver mail.
  # 
! #        The transport field specifies the name of a mail  delivery
  #        transport (the first name of a mail delivery service entry
  #        in the Postfix master.cf file).
  # 
! #        The interpretation  of  the  nexthop  field  is  transport
! #        dependent.  In  the  case  of SMTP, specify a service on a
! #        non-default port as host:service,  and  disable  MX  (mail
! #        exchanger)  DNS lookups with [host] or [host]:port. The []
  #        form is required when you specify an IP address instead of
  #        a hostname.
  # 
! #        A  null  transport  and  null nexthop result means "do not
! #        change": use the delivery transport and  nexthop  informa-
! #        tion  that  would  be used when the entire transport table
  #        did not exist.
  # 
! #        A non-null transport  field  with  a  null  nexthop  field
  #        resets the nexthop information to the recipient domain.
  # 
! #        A  null  transport  field with non-null nexthop field does
  #        not modify the transport information.
  # 
  # EXAMPLES
! #        In order to deliver internal mail directly, while using  a
! #        mail  relay  for  all other mail, specify a null entry for
! #        internal destinations (do not change the  delivery  trans-
! #        port  or  the  nexthop information) and specify a wildcard
  #        for all other destinations.
  # 
  #             my.domain    :
  #             .my.domain   :
  #             *            smtp:outbound-relay.my.domain
  # 
! #        In order to send mail for example.com and  its  subdomains
  #        via the uucp transport to the UUCP host named example:
  # 
  #             example.com      uucp:example
  #             .example.com     uucp:example
  # 
! #        When  no  nexthop  host name is specified, the destination
! #        domain name is used instead. For  example,  the  following
! #        directs  mail  for user@example.com via the slow transport
! #        to a mail exchanger for example.com.  The  slow  transport
  #        could be configured to run at most one delivery process at
  #        a time:
  # 
  #             example.com      slow:
  # 
  #        When no transport is specified, Postfix uses the transport
! #        that  matches  the  address  domain class (see DESCRIPTION
! #        above).  The following sends all mail for example.com  and
  #        its subdomains to host gateway.example.com:
  # 
  #             example.com      :[gateway.example.com]
  #             .example.com     :[gateway.example.com]
  # 
! #        In  the  above  example, the [] suppress MX lookups.  This
! #        prevents mail routing loops when your machine  is  primary
  #        MX host for example.com.
  # 
! #        In  the  case  of delivery via SMTP, one may specify host-
  #        name:service instead of just a host:
  # 
  #             example.com      smtp:bar.example:2025
***************
*** 211,265 ****
  # 
  #             .example.com     error:mail for *.example.com is not deliverable
  # 
! #        This causes all mail for user@anything.example.com  to  be
  #        bounced.
  # 
  # REGULAR EXPRESSION TABLES
! #        This  section  describes how the table lookups change when
  #        the table is given in the form of regular expressions. For
! #        a  description  of regular expression lookup table syntax,
  #        see regexp_table(5) or pcre_table(5).
  # 
! #        Each pattern is a regular expression that  is  applied  to
! #        the    entire    address    being    looked    up.   Thus,
! #        some.domain.hierarchy is not  looked  up  via  its  parent
! #        domains,  nor is user+foo@domain looked up as user@domain.
  # 
! #        Patterns are applied in the order as specified in the  ta-
! #        ble,  until  a  pattern  is  found that matches the search
  #        string.
  # 
  #        The trivial-rewrite(8) server disallows regular expression
! #        substitution  of  $1  etc.  in  regular  expression lookup
! #        tables, because that could open a security  hole  (Postfix
  #        version 2.3 and later).
  # 
  # TCP-BASED TABLES
! #        This  section  describes how the table lookups change when
  #        lookups are directed to a TCP-based server. For a descrip-
  #        tion of the TCP client/server lookup protocol, see tcp_ta-
  #        ble(5).  This feature is not available up to and including
  #        Postfix version 2.4.
  # 
! #        Each  lookup  operation  uses the entire recipient address
! #        once.  Thus, some.domain.hierarchy is not  looked  up  via
! #        its  parent  domains,  nor is user+foo@domain looked up as
  #        user@domain.
  # 
  #        Results are the same as with indexed file lookups.
  # 
  # CONFIGURATION PARAMETERS
! #        The following main.cf parameters are especially  relevant.
! #        The  text  below  provides  only  a parameter summary. See
  #        postconf(5) for more details including examples.
  # 
  #        empty_address_recipient
! #               The address that is looked up instead of  the  null
  #               sender address.
  # 
  #        parent_domain_matches_subdomains
! #               List  of  Postfix features that use domain.tld pat-
! #               terns  to  match  sub.domain.tld  (as  opposed   to
  #               requiring .domain.tld patterns).
  # 
  #        transport_maps
--- 213,267 ----
  # 
  #             .example.com     error:mail for *.example.com is not deliverable
  # 
! #        This  causes  all mail for user@anything.example.com to be
  #        bounced.
  # 
  # REGULAR EXPRESSION TABLES
! #        This section describes how the table lookups  change  when
  #        the table is given in the form of regular expressions. For
! #        a description of regular expression lookup  table  syntax,
  #        see regexp_table(5) or pcre_table(5).
  # 
! #        Each  pattern  is  a regular expression that is applied to
! #        the   entire    address    being    looked    up.    Thus,
! #        some.domain.hierarchy  is  not  looked  up  via its parent
! #        domains, nor is user+foo@domain looked up as  user@domain.
  # 
! #        Patterns  are applied in the order as specified in the ta-
! #        ble, until a pattern is  found  that  matches  the  search
  #        string.
  # 
  #        The trivial-rewrite(8) server disallows regular expression
! #        substitution of  $1  etc.  in  regular  expression  lookup
! #        tables,  because  that could open a security hole (Postfix
  #        version 2.3 and later).
  # 
  # TCP-BASED TABLES
! #        This section describes how the table lookups  change  when
  #        lookups are directed to a TCP-based server. For a descrip-
  #        tion of the TCP client/server lookup protocol, see tcp_ta-
  #        ble(5).  This feature is not available up to and including
  #        Postfix version 2.4.
  # 
! #        Each lookup operation uses the  entire  recipient  address
! #        once.   Thus,  some.domain.hierarchy  is not looked up via
! #        its parent domains, nor is user+foo@domain  looked  up  as
  #        user@domain.
  # 
  #        Results are the same as with indexed file lookups.
  # 
  # CONFIGURATION PARAMETERS
! #        The  following main.cf parameters are especially relevant.
! #        The text below provides  only  a  parameter  summary.  See
  #        postconf(5) for more details including examples.
  # 
  #        empty_address_recipient
! #               The  address  that is looked up instead of the null
  #               sender address.
  # 
  #        parent_domain_matches_subdomains
! #               List of Postfix features that use  domain.tld  pat-
! #               terns   to  match  sub.domain.tld  (as  opposed  to
  #               requiring .domain.tld patterns).
  # 
  #        transport_maps
***************
*** 272,285 ****
  #        postmap(1), Postfix lookup table manager
  # 
  # README FILES
! #        Use  "postconf  readme_directory" or "postconf html_direc-
  #        tory" to locate this information.
  #        ADDRESS_REWRITING_README, address rewriting guide
  #        DATABASE_README, Postfix lookup table overview
  #        FILTER_README, external content filter
  # 
  # LICENSE
! #        The Secure Mailer license must be  distributed  with  this
  #        software.
  # 
  # AUTHOR(S)
--- 274,287 ----
  #        postmap(1), Postfix lookup table manager
  # 
  # README FILES
! #        Use "postconf readme_directory" or  "postconf  html_direc-
  #        tory" to locate this information.
  #        ADDRESS_REWRITING_README, address rewriting guide
  #        DATABASE_README, Postfix lookup table overview
  #        FILTER_README, external content filter
  # 
  # LICENSE
! #        The  Secure  Mailer  license must be distributed with this
  #        software.
  # 
  # AUTHOR(S)
diff -cr --new-file /var/tmp/postfix-2.5.5/html/oqmgr.8.html ./html/oqmgr.8.html
*** /var/tmp/postfix-2.5.5/html/oqmgr.8.html	Wed Jan 23 20:38:35 2008
--- ./html/oqmgr.8.html	Sat Jan  3 20:20:06 2009
***************
*** 321,331 ****
                The default location of  the  Postfix  <a href="postconf.5.html">main.cf</a>  and
                <a href="master.5.html">master.cf</a> configuration files.
  
-        <b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
-               How  much time a Postfix daemon process may take to
-               handle a request  before  it  is  terminated  by  a
-               built-in watchdog timer.
- 
         <b><a href="postconf.5.html#defer_transports">defer_transports</a> (empty)</b>
                The  names  of  message  delivery  transports  that
                should  not  deliver  mail  unless  someone  issues
--- 321,326 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/html/pcre_table.5.html ./html/pcre_table.5.html
*** /var/tmp/postfix-2.5.5/html/pcre_table.5.html	Fri Jul 13 16:17:01 2007
--- ./html/pcre_table.5.html	Sat Jan  3 20:20:06 2009
***************
*** 110,121 ****
  
         <b>x</b> (default: off)
                Toggles  the  pcre extended flag. When this flag is
!               on, whitespace in the  pattern  (other  than  in  a
!               character class) and characters between a <b>#</b> outside
!               a character class and the  next  newline  character
!               are  ignored.  An escaping backslash can be used to
!               include a whitespace or <b>#</b> character as part of  the
!               pattern.
  
         <b>A</b> (default: off)
                Toggles  the PCRE_ANCHORED flag.  When this flag is
--- 110,121 ----
  
         <b>x</b> (default: off)
                Toggles  the  pcre extended flag. When this flag is
!               on, whitespace characters  in  the  pattern  (other
!               than in a character class) are ignored.  To include
!               a whitespace character  as  part  of  the  pattern,
!               escape it with backslash.
! 
!               Note: do not use <b>#</b><i>comment</i> after patterns.
  
         <b>A</b> (default: off)
                Toggles  the PCRE_ANCHORED flag.  When this flag is
diff -cr --new-file /var/tmp/postfix-2.5.5/html/pickup.8.html ./html/pickup.8.html
*** /var/tmp/postfix-2.5.5/html/pickup.8.html	Tue Jan  8 17:22:42 2008
--- ./html/pickup.8.html	Sat Jan  3 20:20:05 2009
***************
*** 65,75 ****
                The default location of  the  Postfix  <a href="postconf.5.html">main.cf</a>  and
                <a href="master.5.html">master.cf</a> configuration files.
  
-        <b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
-               How  much time a Postfix daemon process may take to
-               handle a request  before  it  is  terminated  by  a
-               built-in watchdog timer.
- 
         <b><a href="postconf.5.html#ipc_timeout">ipc_timeout</a> (3600s)</b>
                The time limit for sending or receiving information
                over an internal communication channel.
--- 65,70 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/html/qmgr.8.html ./html/qmgr.8.html
*** /var/tmp/postfix-2.5.5/html/qmgr.8.html	Wed Jan 23 20:38:35 2008
--- ./html/qmgr.8.html	Sat Jan  3 20:20:05 2009
***************
*** 393,403 ****
                The default location of  the  Postfix  <a href="postconf.5.html">main.cf</a>  and
                <a href="master.5.html">master.cf</a> configuration files.
  
-        <b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
-               How  much time a Postfix daemon process may take to
-               handle a request  before  it  is  terminated  by  a
-               built-in watchdog timer.
- 
         <b><a href="postconf.5.html#defer_transports">defer_transports</a> (empty)</b>
                The  names  of  message  delivery  transports  that
                should  not  deliver  mail  unless  someone  issues
--- 393,398 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/html/transport.5.html ./html/transport.5.html
*** /var/tmp/postfix-2.5.5/html/transport.5.html	Fri Jul 13 16:17:00 2007
--- ./html/transport.5.html	Sat Jan  3 20:20:06 2009
***************
*** 127,209 ****
                ting.   Otherwise, a domain name matches itself and
                its subdomains.
  
!        Note 1: the special pattern <b>*</b> represents any address (i.e.
!        it functions as the wild-card pattern).
  
!        Note  2:  the  null  recipient  address  is  looked  up as
         <b>$<a href="postconf.5.html#empty_address_recipient">empty_address_recipient</a></b>@<b>$<a href="postconf.5.html#myhostname">myhostname</a></b> (default: mailer-dae-
         mon@hostname).
  
!        Note  3:  <i>user@domain</i>  or  <i>user+extension@domain</i> lookup is
         available in Postfix 2.0 and later.
  
  <b>RESULT FORMAT</b>
!        The lookup result is of the form  <i>transport</i><b>:</b><i>nexthop</i>.   The
!        <i>transport</i>  field  specifies a mail delivery transport such
!        as <b>smtp</b> or <b>local</b>. The <i>nexthop</i> field  specifies  where  and
         how to deliver mail.
  
!        The  transport field specifies the name of a mail delivery
         transport (the first name of a mail delivery service entry
         in the Postfix <a href="master.5.html"><b>master.cf</b></a> file).
  
!        The  interpretation  of  the  nexthop  field  is transport
!        dependent. In the case of SMTP, specify  a  service  on  a
!        non-default  port  as  <i>host</i>:<i>service</i>,  and disable MX (mail
!        exchanger) DNS lookups with [<i>host</i>] or [<i>host</i>]:<i>port</i>. The  []
         form is required when you specify an IP address instead of
         a hostname.
  
!        A null <i>transport</i> and null <i>nexthop</i>  result  means  "do  not
!        change":  use  the delivery transport and nexthop informa-
!        tion that would be used when the  entire  transport  table
         did not exist.
  
!        A  non-null  <i>transport</i>  field  with  a  null <i>nexthop</i> field
         resets the nexthop information to the recipient domain.
  
!        A null <i>transport</i> field with non-null  <i>nexthop</i>  field  does
         not modify the transport information.
  
  <b>EXAMPLES</b>
!        In  order to deliver internal mail directly, while using a
!        mail relay for all other mail, specify a  null  entry  for
!        internal  destinations  (do not change the delivery trans-
!        port or the nexthop information) and  specify  a  wildcard
         for all other destinations.
  
              <b>my.domain    :</b>
              <b>.my.domain   :</b>
              <b>*            <a href="smtp.8.html">smtp</a>:outbound-relay.my.domain</b>
  
!        In  order  to send mail for <b>example.com</b> and its subdomains
         via the <b>uucp</b> transport to the UUCP host named <b>example</b>:
  
              <b>example.com      uucp:example</b>
              <b>.example.com     uucp:example</b>
  
!        When no nexthop host name is  specified,  the  destination
!        domain  name  is  used instead. For example, the following
!        directs mail for <i>user</i>@<b>example.com</b> via the  <b>slow</b>  transport
!        to  a  mail exchanger for <b>example.com</b>.  The <b>slow</b> transport
         could be configured to run at most one delivery process at
         a time:
  
              <b>example.com      slow:</b>
  
         When no transport is specified, Postfix uses the transport
!        that matches the address  domain  class  (see  DESCRIPTION
!        above).   The following sends all mail for <b>example.com</b> and
         its subdomains to host <b>gateway.example.com</b>:
  
              <b>example.com      :[gateway.example.com]</b>
              <b>.example.com     :[gateway.example.com]</b>
  
!        In the above example, the [] suppress  MX  lookups.   This
!        prevents  mail  routing loops when your machine is primary
         MX host for <b>example.com</b>.
  
!        In the case of delivery via SMTP, one  may  specify  <i>host-</i>
         <i>name</i>:<i>service</i> instead of just a host:
  
              <b>example.com      <a href="smtp.8.html">smtp</a>:bar.example:2025</b>
--- 127,211 ----
                ting.   Otherwise, a domain name matches itself and
                its subdomains.
  
!        <b>*</b> <i>transport</i>:<i>nexthop</i>
!               The special pattern <b>*</b> represents any address  (i.e.
!               it  functions  as  the  wild-card  pattern,  and is
!               unique to Postfix transport tables).
  
!        Note 1:  the  null  recipient  address  is  looked  up  as
         <b>$<a href="postconf.5.html#empty_address_recipient">empty_address_recipient</a></b>@<b>$<a href="postconf.5.html#myhostname">myhostname</a></b> (default: mailer-dae-
         mon@hostname).
  
!        Note 2: <i>user@domain</i>  or  <i>user+extension@domain</i>  lookup  is
         available in Postfix 2.0 and later.
  
  <b>RESULT FORMAT</b>
!        The  lookup  result is of the form <i>transport</i><b>:</b><i>nexthop</i>.  The
!        <i>transport</i> field specifies a mail delivery  transport  such
!        as  <b>smtp</b>  or  <b>local</b>. The <i>nexthop</i> field specifies where and
         how to deliver mail.
  
!        The transport field specifies the name of a mail  delivery
         transport (the first name of a mail delivery service entry
         in the Postfix <a href="master.5.html"><b>master.cf</b></a> file).
  
!        The interpretation  of  the  nexthop  field  is  transport
!        dependent.  In  the  case  of SMTP, specify a service on a
!        non-default port as <i>host</i>:<i>service</i>,  and  disable  MX  (mail
!        exchanger)  DNS lookups with [<i>host</i>] or [<i>host</i>]:<i>port</i>. The []
         form is required when you specify an IP address instead of
         a hostname.
  
!        A  null  <i>transport</i>  and  null <i>nexthop</i> result means "do not
!        change": use the delivery transport and  nexthop  informa-
!        tion  that  would  be used when the entire transport table
         did not exist.
  
!        A non-null <i>transport</i>  field  with  a  null  <i>nexthop</i>  field
         resets the nexthop information to the recipient domain.
  
!        A  null  <i>transport</i>  field with non-null <i>nexthop</i> field does
         not modify the transport information.
  
  <b>EXAMPLES</b>
!        In order to deliver internal mail directly, while using  a
!        mail  relay  for  all other mail, specify a null entry for
!        internal destinations (do not change the  delivery  trans-
!        port  or  the  nexthop information) and specify a wildcard
         for all other destinations.
  
              <b>my.domain    :</b>
              <b>.my.domain   :</b>
              <b>*            <a href="smtp.8.html">smtp</a>:outbound-relay.my.domain</b>
  
!        In order to send mail for <b>example.com</b> and  its  subdomains
         via the <b>uucp</b> transport to the UUCP host named <b>example</b>:
  
              <b>example.com      uucp:example</b>
              <b>.example.com     uucp:example</b>
  
!        When  no  nexthop  host name is specified, the destination
!        domain name is used instead. For  example,  the  following
!        directs  mail  for <i>user</i>@<b>example.com</b> via the <b>slow</b> transport
!        to a mail exchanger for <b>example.com</b>.  The  <b>slow</b>  transport
         could be configured to run at most one delivery process at
         a time:
  
              <b>example.com      slow:</b>
  
         When no transport is specified, Postfix uses the transport
!        that  matches  the  address  domain class (see DESCRIPTION
!        above).  The following sends all mail for <b>example.com</b>  and
         its subdomains to host <b>gateway.example.com</b>:
  
              <b>example.com      :[gateway.example.com]</b>
              <b>.example.com     :[gateway.example.com]</b>
  
!        In  the  above  example, the [] suppress MX lookups.  This
!        prevents mail routing loops when your machine  is  primary
         MX host for <b>example.com</b>.
  
!        In  the  case  of delivery via SMTP, one may specify <i>host-</i>
         <i>name</i>:<i>service</i> instead of just a host:
  
              <b>example.com      <a href="smtp.8.html">smtp</a>:bar.example:2025</b>
***************
*** 217,271 ****
  
              <b>.example.com     <a href="error.8.html">error</a>:mail for *.example.com is not deliverable</b>
  
!        This causes all mail for <i>user</i>@<i>anything</i><b>.example.com</b>  to  be
         bounced.
  
  <b>REGULAR EXPRESSION TABLES</b>
!        This  section  describes how the table lookups change when
         the table is given in the form of regular expressions. For
!        a  description  of regular expression lookup table syntax,
         see <a href="regexp_table.5.html"><b>regexp_table</b>(5)</a> or <a href="pcre_table.5.html"><b>pcre_table</b>(5)</a>.
  
!        Each pattern is a regular expression that  is  applied  to
!        the    entire    address    being    looked    up.   Thus,
!        <i>some.domain.hierarchy</i> is not  looked  up  via  its  parent
!        domains,  nor is <i>user+foo@domain</i> looked up as <i>user@domain</i>.
  
!        Patterns are applied in the order as specified in the  ta-
!        ble,  until  a  pattern  is  found that matches the search
         string.
  
         The <a href="trivial-rewrite.8.html"><b>trivial-rewrite</b>(8)</a> server disallows regular expression
!        substitution  of  $1  etc.  in  regular  expression lookup
!        tables, because that could open a security  hole  (Postfix
         version 2.3 and later).
  
  <b>TCP-BASED TABLES</b>
!        This  section  describes how the table lookups change when
         lookups are directed to a TCP-based server. For a descrip-
         tion of the TCP client/server lookup protocol, see <a href="tcp_table.5.html"><b>tcp_ta-</b></a>
         <a href="tcp_table.5.html"><b>ble</b>(5)</a>.  This feature is not available up to and including
         Postfix version 2.4.
  
!        Each  lookup  operation  uses the entire recipient address
!        once.  Thus, <i>some.domain.hierarchy</i> is not  looked  up  via
!        its  parent  domains,  nor is <i>user+foo@domain</i> looked up as
         <i>user@domain</i>.
  
         Results are the same as with indexed file lookups.
  
  <b>CONFIGURATION PARAMETERS</b>
!        The following <a href="postconf.5.html"><b>main.cf</b></a> parameters are especially  relevant.
!        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#empty_address_recipient">empty_address_recipient</a></b>
!               The address that is looked up instead of  the  null
                sender address.
  
         <b><a href="postconf.5.html#parent_domain_matches_subdomains">parent_domain_matches_subdomains</a></b>
!               List  of  Postfix features that use <i>domain.tld</i> pat-
!               terns  to  match  <i>sub.domain.tld</i>  (as  opposed   to
                requiring <i>.domain.tld</i> patterns).
  
         <b><a href="postconf.5.html#transport_maps">transport_maps</a></b>
--- 219,273 ----
  
              <b>.example.com     <a href="error.8.html">error</a>:mail for *.example.com is not deliverable</b>
  
!        This  causes  all mail for <i>user</i>@<i>anything</i><b>.example.com</b> to be
         bounced.
  
  <b>REGULAR EXPRESSION TABLES</b>
!        This section describes how the table lookups  change  when
         the table is given in the form of regular expressions. For
!        a description of regular expression lookup  table  syntax,
         see <a href="regexp_table.5.html"><b>regexp_table</b>(5)</a> or <a href="pcre_table.5.html"><b>pcre_table</b>(5)</a>.
  
!        Each  pattern  is  a regular expression that is applied to
!        the   entire    address    being    looked    up.    Thus,
!        <i>some.domain.hierarchy</i>  is  not  looked  up  via its parent
!        domains, nor is <i>user+foo@domain</i> looked up as  <i>user@domain</i>.
  
!        Patterns  are applied in the order as specified in the ta-
!        ble, until a pattern is  found  that  matches  the  search
         string.
  
         The <a href="trivial-rewrite.8.html"><b>trivial-rewrite</b>(8)</a> server disallows regular expression
!        substitution of  $1  etc.  in  regular  expression  lookup
!        tables,  because  that could open a security hole (Postfix
         version 2.3 and later).
  
  <b>TCP-BASED TABLES</b>
!        This section describes how the table lookups  change  when
         lookups are directed to a TCP-based server. For a descrip-
         tion of the TCP client/server lookup protocol, see <a href="tcp_table.5.html"><b>tcp_ta-</b></a>
         <a href="tcp_table.5.html"><b>ble</b>(5)</a>.  This feature is not available up to and including
         Postfix version 2.4.
  
!        Each lookup operation uses the  entire  recipient  address
!        once.   Thus,  <i>some.domain.hierarchy</i>  is not looked up via
!        its parent domains, nor is <i>user+foo@domain</i>  looked  up  as
         <i>user@domain</i>.
  
         Results are the same as with indexed file lookups.
  
  <b>CONFIGURATION PARAMETERS</b>
!        The  following <a href="postconf.5.html"><b>main.cf</b></a> parameters are especially relevant.
!        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#empty_address_recipient">empty_address_recipient</a></b>
!               The  address  that is looked up instead of the null
                sender address.
  
         <b><a href="postconf.5.html#parent_domain_matches_subdomains">parent_domain_matches_subdomains</a></b>
!               List of Postfix features that use  <i>domain.tld</i>  pat-
!               terns   to  match  <i>sub.domain.tld</i>  (as  opposed  to
                requiring <i>.domain.tld</i> patterns).
  
         <b><a href="postconf.5.html#transport_maps">transport_maps</a></b>
***************
*** 283,289 ****
         <a href="FILTER_README.html">FILTER_README</a>, external content filter
  
  <b>LICENSE</b>
!        The Secure Mailer license must be  distributed  with  this
         software.
  
  <b>AUTHOR(S)</b>
--- 285,291 ----
         <a href="FILTER_README.html">FILTER_README</a>, external content filter
  
  <b>LICENSE</b>
!        The  Secure  Mailer  license must be distributed with this
         software.
  
  <b>AUTHOR(S)</b>
diff -cr --new-file /var/tmp/postfix-2.5.5/man/man5/pcre_table.5 ./man/man5/pcre_table.5
*** /var/tmp/postfix-2.5.5/man/man5/pcre_table.5	Wed Apr 11 17:03:43 2007
--- ./man/man5/pcre_table.5	Sat Jan  3 20:20:05 2009
***************
*** 100,110 ****
  matching.
  .IP "\fBx\fR (default: off)"
  Toggles the pcre extended flag. When this flag is on, whitespace
! in the pattern (other than in a character class) and
! characters between a \fB#\fR outside a character class and
! the next newline character are ignored. An escaping backslash
! can be used to include a whitespace or \fB#\fR character
! as part of the pattern.
  .IP "\fBA\fR (default: off)"
  Toggles the PCRE_ANCHORED flag.  When this flag is on,
  the pattern is forced to be "anchored", that is, it is
--- 100,110 ----
  matching.
  .IP "\fBx\fR (default: off)"
  Toggles the pcre extended flag. When this flag is on, whitespace
! characters in the pattern (other than in a character class)
! are ignored.  To include a whitespace character as part of
! the pattern, escape it with backslash.
! .sp
! Note: do not use \fB#\fIcomment\fR after patterns.
  .IP "\fBA\fR (default: off)"
  Toggles the PCRE_ANCHORED flag.  When this flag is on,
  the pattern is forced to be "anchored", that is, it is
diff -cr --new-file /var/tmp/postfix-2.5.5/man/man5/transport.5 ./man/man5/transport.5
*** /var/tmp/postfix-2.5.5/man/man5/transport.5	Mon Jun  4 19:49:33 2007
--- ./man/man5/transport.5	Sat Jan  3 20:20:05 2009
***************
*** 118,132 ****
  string \fBtransport_maps\fR is not listed in the
  \fBparent_domain_matches_subdomains\fR configuration setting.
  Otherwise, a domain name matches itself and its subdomains.
  .PP
! Note 1: the special pattern \fB*\fR represents any address (i.e. it
! functions as the wild-card pattern).
! 
! Note 2: the null recipient address is looked up as
  \fB$empty_address_recipient\fR@\fB$myhostname\fR (default:
  mailer-daemon@hostname).
  
! Note 3: \fIuser@domain\fR or \fIuser+extension@domain\fR
  lookup is available in Postfix 2.0 and later.
  .SH "RESULT FORMAT"
  .na
--- 118,133 ----
  string \fBtransport_maps\fR is not listed in the
  \fBparent_domain_matches_subdomains\fR configuration setting.
  Otherwise, a domain name matches itself and its subdomains.
+ .IP "\fB*\fI transport\fR:\fInexthop\fR"
+ The special pattern \fB*\fR represents any address (i.e. it
+ functions as the wild-card pattern, and is unique to Postfix
+ transport tables).
  .PP
! Note 1: the null recipient address is looked up as
  \fB$empty_address_recipient\fR@\fB$myhostname\fR (default:
  mailer-daemon@hostname).
  
! Note 2: \fIuser@domain\fR or \fIuser+extension@domain\fR
  lookup is available in Postfix 2.0 and later.
  .SH "RESULT FORMAT"
  .na
diff -cr --new-file /var/tmp/postfix-2.5.5/man/man8/oqmgr.8 ./man/man8/oqmgr.8
*** /var/tmp/postfix-2.5.5/man/man8/oqmgr.8	Wed Jan 23 20:10:34 2008
--- ./man/man8/oqmgr.8	Sat Jan  3 20:20:05 2009
***************
*** 287,295 ****
  .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  The default location of the Postfix main.cf and master.cf
  configuration files.
- .IP "\fBdaemon_timeout (18000s)\fR"
- How much time a Postfix daemon process may take to handle a
- request before it is terminated by a built-in watchdog timer.
  .IP "\fBdefer_transports (empty)\fR"
  The names of message delivery transports that should not deliver mail
  unless someone issues "\fBsendmail -q\fR" or equivalent.
--- 287,292 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/man/man8/pickup.8 ./man/man8/pickup.8
*** /var/tmp/postfix-2.5.5/man/man8/pickup.8	Tue Jan  8 17:22:40 2008
--- ./man/man8/pickup.8	Sat Jan  3 20:20:05 2009
***************
*** 77,85 ****
  .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  The default location of the Postfix main.cf and master.cf
  configuration files.
- .IP "\fBdaemon_timeout (18000s)\fR"
- How much time a Postfix daemon process may take to handle a
- request before it is terminated by a built-in watchdog timer.
  .IP "\fBipc_timeout (3600s)\fR"
  The time limit for sending or receiving information over an internal
  communication channel.
--- 77,82 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/man/man8/qmgr.8 ./man/man8/qmgr.8
*** /var/tmp/postfix-2.5.5/man/man8/qmgr.8	Wed Jan 23 20:10:34 2008
--- ./man/man8/qmgr.8	Sat Jan  3 20:20:05 2009
***************
*** 337,345 ****
  .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  The default location of the Postfix main.cf and master.cf
  configuration files.
- .IP "\fBdaemon_timeout (18000s)\fR"
- How much time a Postfix daemon process may take to handle a
- request before it is terminated by a built-in watchdog timer.
  .IP "\fBdefer_transports (empty)\fR"
  The names of message delivery transports that should not deliver mail
  unless someone issues "\fBsendmail -q\fR" or equivalent.
--- 337,342 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/proto/pcre_table ./proto/pcre_table
*** /var/tmp/postfix-2.5.5/proto/pcre_table	Wed Apr 11 17:03:15 2007
--- ./proto/pcre_table	Wed Nov 26 18:28:58 2008
***************
*** 90,100 ****
  #	matching.
  # .IP "\fBx\fR (default: off)"
  #	Toggles the pcre extended flag. When this flag is on, whitespace
! #	in the pattern (other than in a character class) and
! #	characters between a \fB#\fR outside a character class and
! #	the next newline character are ignored. An escaping backslash
! #	can be used to include a whitespace or \fB#\fR character
! #	as part of the pattern.
  # .IP "\fBA\fR (default: off)"
  #	Toggles the PCRE_ANCHORED flag.  When this flag is on,
  #	the pattern is forced to be "anchored", that is, it is
--- 90,100 ----
  #	matching.
  # .IP "\fBx\fR (default: off)"
  #	Toggles the pcre extended flag. When this flag is on, whitespace
! #	characters in the pattern (other than in a character class)
! #	are ignored.  To include a whitespace character as part of
! #	the pattern, escape it with backslash.
! # .sp
! #	Note: do not use \fB#\fIcomment\fR after patterns.
  # .IP "\fBA\fR (default: off)"
  #	Toggles the PCRE_ANCHORED flag.  When this flag is on,
  #	the pattern is forced to be "anchored", that is, it is
diff -cr --new-file /var/tmp/postfix-2.5.5/proto/transport ./proto/transport
*** /var/tmp/postfix-2.5.5/proto/transport	Mon Jun  4 19:49:26 2007
--- ./proto/transport	Mon Dec 22 08:15:45 2008
***************
*** 106,120 ****
  #	string \fBtransport_maps\fR is not listed in the
  #	\fBparent_domain_matches_subdomains\fR configuration setting.
  #	Otherwise, a domain name matches itself and its subdomains.
  # .PP
! #	Note 1: the special pattern \fB*\fR represents any address (i.e. it
! #	functions as the wild-card pattern).
! #
! #	Note 2: the null recipient address is looked up as
  #	\fB$empty_address_recipient\fR@\fB$myhostname\fR (default:
  #	mailer-daemon@hostname).
  #
! #	Note 3: \fIuser@domain\fR or \fIuser+extension@domain\fR
  #	lookup is available in Postfix 2.0 and later.
  # RESULT FORMAT
  # .ad
--- 106,121 ----
  #	string \fBtransport_maps\fR is not listed in the
  #	\fBparent_domain_matches_subdomains\fR configuration setting.
  #	Otherwise, a domain name matches itself and its subdomains.
+ # .IP "\fB*\fI transport\fR:\fInexthop\fR"
+ #	The special pattern \fB*\fR represents any address (i.e. it
+ #	functions as the wild-card pattern, and is unique to Postfix
+ #	transport tables).
  # .PP
! #	Note 1: the null recipient address is looked up as
  #	\fB$empty_address_recipient\fR@\fB$myhostname\fR (default:
  #	mailer-daemon@hostname).
  #
! #	Note 2: \fIuser@domain\fR or \fIuser+extension@domain\fR
  #	lookup is available in Postfix 2.0 and later.
  # RESULT FORMAT
  # .ad
diff -cr --new-file /var/tmp/postfix-2.5.5/src/oqmgr/qmgr.c ./src/oqmgr/qmgr.c
*** /var/tmp/postfix-2.5.5/src/oqmgr/qmgr.c	Wed Jan 23 20:10:19 2008
--- ./src/oqmgr/qmgr.c	Sat Jan  3 19:48:43 2009
***************
*** 253,261 ****
  /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  /*	The default location of the Postfix main.cf and master.cf
  /*	configuration files.
- /* .IP "\fBdaemon_timeout (18000s)\fR"
- /*	How much time a Postfix daemon process may take to handle a
- /*	request before it is terminated by a built-in watchdog timer.
  /* .IP "\fBdefer_transports (empty)\fR"
  /*	The names of message delivery transports that should not deliver mail
  /*	unless someone issues "\fBsendmail -q\fR" or equivalent.
--- 253,258 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/src/pickup/pickup.c ./src/pickup/pickup.c
*** /var/tmp/postfix-2.5.5/src/pickup/pickup.c	Tue Jan  8 15:35:08 2008
--- ./src/pickup/pickup.c	Sat Jan  3 19:48:54 2009
***************
*** 57,65 ****
  /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  /*	The default location of the Postfix main.cf and master.cf
  /*	configuration files.
- /* .IP "\fBdaemon_timeout (18000s)\fR"
- /*	How much time a Postfix daemon process may take to handle a
- /*	request before it is terminated by a built-in watchdog timer.
  /* .IP "\fBipc_timeout (3600s)\fR"
  /*	The time limit for sending or receiving information over an internal
  /*	communication channel.
--- 57,62 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/src/qmgr/qmgr.c ./src/qmgr/qmgr.c
*** /var/tmp/postfix-2.5.5/src/qmgr/qmgr.c	Wed Jan 23 20:10:19 2008
--- ./src/qmgr/qmgr.c	Sat Jan  3 19:48:49 2009
***************
*** 299,307 ****
  /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  /*	The default location of the Postfix main.cf and master.cf
  /*	configuration files.
- /* .IP "\fBdaemon_timeout (18000s)\fR"
- /*	How much time a Postfix daemon process may take to handle a
- /*	request before it is terminated by a built-in watchdog timer.
  /* .IP "\fBdefer_transports (empty)\fR"
  /*	The names of message delivery transports that should not deliver mail
  /*	unless someone issues "\fBsendmail -q\fR" or equivalent.
--- 299,304 ----
diff -cr --new-file /var/tmp/postfix-2.5.5/src/smtp/smtp_reuse.c ./src/smtp/smtp_reuse.c
*** /var/tmp/postfix-2.5.5/src/smtp/smtp_reuse.c	Tue Oct 17 14:49:24 2006
--- ./src/smtp/smtp_reuse.c	Wed Dec  3 19:06:42 2008
***************
*** 214,219 ****
--- 214,224 ----
      }
  
      /*
+      * Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE.
+      */
+     vstream_tweak_sock(session->stream);
+ 
+     /*
       * Update the list of used cached addresses.
       */
      htable_enter(state->cache_used, session->addr, (char *) 0);
diff -cr --new-file /var/tmp/postfix-2.5.5/src/smtpd/smtpd.c ./src/smtpd/smtpd.c
*** /var/tmp/postfix-2.5.5/src/smtpd/smtpd.c	Fri Jun 20 07:59:45 2008
--- ./src/smtpd/smtpd.c	Sat Jan  3 20:04:04 2009
***************
*** 4551,4557 ****
  				    = var_smtpd_tls_dh512_param_file,
  				    protocols = enforce_tls ?
  				    var_smtpd_tls_mand_proto : "",
! 				    ask_ccert = var_smtpd_tls_ask_ccert,
  				    fpt_dgst = var_smtpd_tls_fpt_dgst);
  	    else
  		msg_warn("No server certs available. TLS won't be enabled");
--- 4551,4557 ----
  				    = var_smtpd_tls_dh512_param_file,
  				    protocols = enforce_tls ?
  				    var_smtpd_tls_mand_proto : "",
! 				    ask_ccert = wantcert,
  				    fpt_dgst = var_smtpd_tls_fpt_dgst);
  	    else
  		msg_warn("No server certs available. TLS won't be enabled");