Postfix 2.1.2 fixes the following problems:

- Non-portable reuse of variable length argument lists caused
segmentation violation on some PowerPC platforms.

- The SMTP client did not reset SMTP and SASL session information
before attempting delivery to an alternate SMTP server.

- Typos in documentation.

Prereq: "2.1.1"
diff -cr /tmp/postfix-2.1.1/src/global/mail_version.h ./src/global/mail_version.h
*** /tmp/postfix-2.1.1/src/global/mail_version.h	Mon May  3 12:57:50 2004
--- ./src/global/mail_version.h	Mon Jun 14 17:43:33 2004
***************
*** 20,27 ****
    * Patches change the patchlevel and the release date. Snapshots change the
    * release date only.
    */
! #define MAIL_RELEASE_DATE	"20040503"
! #define MAIL_VERSION_NUMBER	"2.1.1"
  
  #define VAR_MAIL_VERSION	"mail_version"
  #ifdef SNAPSHOT
--- 20,27 ----
    * Patches change the patchlevel and the release date. Snapshots change the
    * release date only.
    */
! #define MAIL_RELEASE_DATE	"20040615"
! #define MAIL_VERSION_NUMBER	"2.1.2"
  
  #define VAR_MAIL_VERSION	"mail_version"
  #ifdef SNAPSHOT
diff -cr /tmp/postfix-2.1.1/HISTORY ./HISTORY
*** /tmp/postfix-2.1.1/HISTORY	Mon May  3 13:31:10 2004
--- ./HISTORY	Mon Jun 14 17:47:38 2004
***************
*** 9356,9358 ****
--- 9356,9375 ----
  
  	Bugfix: missing "sasl enabled" guard in the SMTPD policy
  	client.  File: smtpd/smtpd_check.c.
+ 
+ 20040614
+ 
+ 	Bugfix: the SMTP client did not reset per-session EHLO,
+ 	SASL, and history information when opening a connection to
+ 	an alternate SMTP server.  This is the result of abstraction
+ 	no longer matching function. Reported and diagnosed by
+ 	Victor Duchovni, Morgan Stanley.
+ 
+ 	Bugfix: non-portable reuse of variadic argument lists.
+ 	Fix by Victor Duchovni, Morgan Stanley. Files:  global/bounce.c,
+ 	global/defer.c, global/sent.c, global/trace.c, global/verify.c.
+ 
+ 	Portability: NetBSD 2.0 has changed from statfs to statvfs.
+ 	John Heasley. File: util/sys_defs.h.
+ 
+ 	Documentation: typo fixes by IKEDA Nozomu.
diff -cr /tmp/postfix-2.1.1/README_FILES/SMTPD_POLICY_README ./README_FILES/SMTPD_POLICY_README
*** /tmp/postfix-2.1.1/README_FILES/SMTPD_POLICY_README	Sun Apr 11 17:05:34 2004
--- ./README_FILES/SMTPD_POLICY_README	Tue May  4 15:49:33 2004
***************
*** 145,151 ****
    * Solaris UNIX-domain sockets do not work reliably. Use TCP sockets instead:
  
       1 /etc/postfix/master.cf:
!      2     127.0.0.1:9998  unix  -       n       n       -       -       spawn
       3       user=nobody argv=/some/where/policy-server
       4
       5 /etc/postfix/main.cf:
--- 145,151 ----
    * Solaris UNIX-domain sockets do not work reliably. Use TCP sockets instead:
  
       1 /etc/postfix/master.cf:
!      2     127.0.0.1:9998  inet  n       n       n       -       -       spawn
       3       user=nobody argv=/some/where/policy-server
       4
       5 /etc/postfix/main.cf:
***************
*** 235,241 ****
  in the "Policy client/server configuration" section above.
  
      1 /etc/postfix/master.cf:
!     2     127.0.0.1:9998  unix  -       n       n       -       -       spawn
      3       user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl
      4
      5 /etc/postfix/main.cf:
--- 235,241 ----
  in the "Policy client/server configuration" section above.
  
      1 /etc/postfix/master.cf:
!     2     127.0.0.1:9998  inet  n       n       n       -       -       spawn
      3       user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl
      4
      5 /etc/postfix/main.cf:
diff -cr /tmp/postfix-2.1.1/RELEASE_NOTES ./RELEASE_NOTES
*** /tmp/postfix-2.1.1/RELEASE_NOTES	Thu Apr 22 18:57:49 2004
--- ./RELEASE_NOTES	Sat May 15 21:43:45 2004
***************
*** 15,28 ****
  Major changes - critical
  ------------------------
  
! If you run Postfix 1.x or earlier then you must stop Postfix before
! upgrading. This is because the master-child protocols have changed,
! and very little will work with the old master daemon process.
! 
! [Incompat 20021119] You can upgrade Postfix 2.0 without stopping.
! After upgrading an existing Postfix 2.0 system you must use "postfix
! reload".  Some internal protocols have changed, but the master-child
! protocols are the same as with Postfix 2.0.
  
  [Incompat 20021119] The Postfix upgrade procedure will add two new
  services to your master.cf file: "trace" and "verify". These servers
--- 15,26 ----
  Major changes - critical
  ------------------------
  
! If you run Postfix 2.0 or earlier then you must stop Postfix before
! upgrading. The master-child protocols have changed between Postfix
! 1.1 and 2.0, and version 2.1 sometimes writes queue files that the
! 2.0 and earlier queue managers complain about. If this happens move
! the files from the corrupt directory to the maildrop directory and
! give them another chance.
  
  [Incompat 20021119] The Postfix upgrade procedure will add two new
  services to your master.cf file: "trace" and "verify". These servers
diff -cr /tmp/postfix-2.1.1/conf/header_checks ./conf/header_checks
*** /tmp/postfix-2.1.1/conf/header_checks	Wed Apr 21 19:07:13 2004
--- ./conf/header_checks	Fri May  7 15:25:21 2004
***************
*** 303,311 ****
  #        exploit.
  # 
  #        /etc/postfix/main.cf:
! #            header_checks = regexp:/etc/postfix/header_checks
  # 
! #        /etc/postfix/header_checks:
  #            /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
  #                REJECT IFRAME vulnerability exploit
  # 
--- 303,311 ----
  #        exploit.
  # 
  #        /etc/postfix/main.cf:
! #            body_checks = regexp:/etc/postfix/body_checks
  # 
! #        /etc/postfix/body_checks:
  #            /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
  #                REJECT IFRAME vulnerability exploit
  # 
diff -cr /tmp/postfix-2.1.1/conf/main.cf ./conf/main.cf
*** /tmp/postfix-2.1.1/conf/main.cf	Thu Apr 15 09:27:21 2004
--- ./conf/main.cf	Sun Jun  6 17:53:58 2004
***************
*** 498,504 ****
  # JUNK MAIL CONTROLS
  # 
  # The controls listed here are only a very small subset. The file
! # SPTMD_ACCESS_README provides an overview.
  
  # The header_checks parameter specifies an optional table with patterns
  # that each logical message header is matched against, including
--- 498,504 ----
  # JUNK MAIL CONTROLS
  # 
  # The controls listed here are only a very small subset. The file
! # SMTPD_ACCESS_README provides an overview.
  
  # The header_checks parameter specifies an optional table with patterns
  # that each logical message header is matched against, including
diff -cr /tmp/postfix-2.1.1/html/SMTPD_POLICY_README.html ./html/SMTPD_POLICY_README.html
*** /tmp/postfix-2.1.1/html/SMTPD_POLICY_README.html	Sat Apr 10 22:44:37 2004
--- ./html/SMTPD_POLICY_README.html	Tue May  4 15:49:27 2004
***************
*** 216,222 ****
  <blockquote>
  <pre>
   1 /etc/postfix/master.cf:
!  2     127.0.0.1:9998  unix  -       n       n       -       -       spawn
   3       user=nobody argv=/some/where/policy-server
   4 
   5 /etc/postfix/main.cf:
--- 216,222 ----
  <blockquote>
  <pre>
   1 /etc/postfix/master.cf:
!  2     127.0.0.1:9998  inet  n       n       n       -       -       spawn
   3       user=nobody argv=/some/where/policy-server
   4 
   5 /etc/postfix/main.cf:
***************
*** 340,346 ****
  <blockquote>
  <pre>
  1 /etc/postfix/master.cf:
! 2     127.0.0.1:9998  unix  -       n       n       -       -       spawn
  3       user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl
  4 
  5 /etc/postfix/main.cf:
--- 340,346 ----
  <blockquote>
  <pre>
  1 /etc/postfix/master.cf:
! 2     127.0.0.1:9998  inet  n       n       n       -       -       spawn
  3       user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl
  4 
  5 /etc/postfix/main.cf:
diff -cr /tmp/postfix-2.1.1/html/header_checks.5.html ./html/header_checks.5.html
*** /tmp/postfix-2.1.1/html/header_checks.5.html	Wed Apr 21 19:07:15 2004
--- ./html/header_checks.5.html	Fri May  7 15:25:23 2004
***************
*** 309,317 ****
         exploit.
  
         /etc/postfix/main.cf:
!            <a href="postconf.5.html#header_checks">header_checks</a> = <a href="regexp_table.5.html">regexp</a>:/etc/postfix/header_checks
  
!        /etc/postfix/header_checks:
             /^&lt;iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0&gt;$/
                 REJECT IFRAME vulnerability exploit
  
--- 309,317 ----
         exploit.
  
         /etc/postfix/main.cf:
!            <a href="postconf.5.html#body_checks">body_checks</a> = <a href="regexp_table.5.html">regexp</a>:/etc/postfix/body_checks
  
!        /etc/postfix/body_checks:
             /^&lt;iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0&gt;$/
                 REJECT IFRAME vulnerability exploit
  
diff -cr /tmp/postfix-2.1.1/html/pickup.8.html ./html/pickup.8.html
*** /tmp/postfix-2.1.1/html/pickup.8.html	Wed Apr 14 10:40:00 2004
--- ./html/pickup.8.html	Mon Jun 14 17:18:55 2004
***************
*** 43,50 ****
         unfiltered user data.
  
  <b>CONFIGURATION PARAMETERS</b>
!        As the pickup daemon is a relatively long-running process,
!        up  to  an  hour  may  pass  before a <b>main.cf</b> change takes
         effect.  Use the command "<b>postfix reload</b>" command to speed
         up a change.
  
--- 43,50 ----
         unfiltered user data.
  
  <b>CONFIGURATION PARAMETERS</b>
!        As the <a href="pickup.8.html">pickup(8)</a> daemon is a relatively long-running  pro-
!        cess, up to an hour may pass before a <b>main.cf</b> change takes
         effect.  Use the command "<b>postfix reload</b>" command to speed
         up a change.
  
diff -cr /tmp/postfix-2.1.1/html/postconf.5.html ./html/postconf.5.html
*** /tmp/postfix-2.1.1/html/postconf.5.html	Thu Apr 22 19:11:56 2004
--- ./html/postconf.5.html	Mon Jun 14 17:18:53 2004
***************
*** 733,738 ****
--- 733,739 ----
  pattern is replaced by its contents; a "<a href="DATABASE_README.html">type:table</a>" lookup table
  is matched when a table entry matches a lookup string (the lookup
  result is ignored).  Continue long lines by starting the next line
+ with whitespace. </p>
  
  
  </DD>
***************
*** 1546,1552 ****
  The names of message delivery transports that should not be delivered
  to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero
  or more names of mail delivery transports names that appear in the
! first field of master.cf).
  </p>
  
  <p>
--- 1547,1553 ----
  The names of message delivery transports that should not be delivered
  to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero
  or more names of mail delivery transports names that appear in the
! first field of master.cf.
  </p>
  
  <p>
***************
*** 3852,3858 ****
  <dd>Send the postmaster copies of the headers of bounced mail, and
  send transcripts of SMTP sessions when Postfix rejects mail. The
  notification is sent to the address specified with the
! <a href="postconf.5.html#bounce_notice_recipient">bounce_notice_recipient</a> configuration parameter (default: postmaster)
  </dd>
  
  <dt><b>2bounce</b></dt>
--- 3853,3859 ----
  <dd>Send the postmaster copies of the headers of bounced mail, and
  send transcripts of SMTP sessions when Postfix rejects mail. The
  notification is sent to the address specified with the
! <a href="postconf.5.html#bounce_notice_recipient">bounce_notice_recipient</a> configuration parameter (default: postmaster).
  </dd>
  
  <dt><b>2bounce</b></dt>
***************
*** 4582,4594 ****
  recipients. See also the <a href="ADDRESS_CLASS_README.html#relay_domain_class">relay domains</a> address class in the
  <a href="ADDRESS_CLASS_README.html">ADDRESS_CLASS_README</a> file.  </p>
  
- <p> The list of domains that are by default delivered via the
- $<a href="postconf.5.html#local_transport">local_transport</a> mail delivery transport. By default this is the
- Postfix <a href="local.8.html">local(8)</a> delivery agent which looks up all recipients in
- /etc/passwd and /etc/aliases. The SMTP server validates recipient
- addresses with $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>. See also the <a href="ADDRESS_CLASS_README.html#local_domain_class">local domain</a>
- address class in the <a href="ADDRESS_CLASS_README.html">ADDRESS_CLASS_README</a> file.  </p>
- 
  <p> NOTE: Postfix will not automatically forward mail for domains
  that list this system as their primary or backup MX host. See the
  <a href="postconf.5.html#permit_mx_backup">permit_mx_backup</a> restriction in the <a href="postconf.5.html">postconf(5)</a> manual page.  </p>
--- 4583,4588 ----
***************
*** 5245,5251 ****
  
  <p>
  The maximal length of message header and body lines that Postfix
! will send via SMTP.  Longer lines are longer are broken by inserting
  "&lt;CR&gt;&lt;LF&gt;&lt;SPACE&gt;". This minimizes the damage to
  MIME formatted mail.
  </p>
--- 5239,5245 ----
  
  <p>
  The maximal length of message header and body lines that Postfix
! will send via SMTP.  Longer lines are broken by inserting
  "&lt;CR&gt;&lt;LF&gt;&lt;SPACE&gt;". This minimizes the damage to
  MIME formatted mail.
  </p>
***************
*** 5765,5771 ****
  <p>
  By default, clients in trusted networks are excluded. Specify a
  list of network blocks, hostnames or .domain names (the initial
! initial dot causes the domain to match any name below it).
  </p>
  
  <p>
--- 5759,5765 ----
  <p>
  By default, clients in trusted networks are excluded. Specify a
  list of network blocks, hostnames or .domain names (the initial
! dot causes the domain to match any name below it).
  </p>
  
  <p>
***************
*** 6407,6413 ****
  </p>
  
  <p> Specify host:port. The host can be specified as an IP address
! or was a symbolic name; no MX lookups are done. When no host or
  host:  are specified, the local machine is assumed.  </p>
  
  <p> This feature is available in Postfix 2.1 and later.  </p>
--- 6401,6407 ----
  </p>
  
  <p> Specify host:port. The host can be specified as an IP address
! or as a symbolic name; no MX lookups are done. When no host or
  host:  are specified, the local machine is assumed.  </p>
  
  <p> This feature is available in Postfix 2.1 and later.  </p>
***************
*** 6606,6613 ****
  the response code for rejected requests (default: 450).  The response
  is always 450 in case of a temporary DNS error.</dd>
  
! <dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b>
! (Postfix 2.0 name: check_recipient_maps)</dt>
  
  <dd> Reject the request when the RCPT TO address is not listed in
  the list of valid recipients for its domain class. See the
--- 6600,6606 ----
  the response code for rejected requests (default: 450).  The response
  is always 450 in case of a temporary DNS error.</dd>
  
! <dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (Postfix 2.0 name: check_recipient_maps)</dt>
  
  <dd> Reject the request when the RCPT TO address is not listed in
  the list of valid recipients for its domain class. See the
diff -cr /tmp/postfix-2.1.1/html/proxymap.8.html ./html/proxymap.8.html
*** /tmp/postfix-2.1.1/html/proxymap.8.html	Wed Apr 14 10:40:07 2004
--- ./html/proxymap.8.html	Mon Jun 14 17:19:00 2004
***************
*** 44,50 ****
                Open the table with type <i>maptype</i> and name  <i>mapname</i>,
                as controlled by <i>flags</i>. The reply includes the <i>map-</i>
                <i>type</i> dependent flags (to distinguish a fixed string
!               table from regular a expression table).
  
         <b>lookup</b> <i>maptype:mapname flags key</i>
                Look  up  the  data stored under the requested key.
--- 44,50 ----
                Open the table with type <i>maptype</i> and name  <i>mapname</i>,
                as controlled by <i>flags</i>. The reply includes the <i>map-</i>
                <i>type</i> dependent flags (to distinguish a fixed string
!               table from a regular expression table).
  
         <b>lookup</b> <i>maptype:mapname flags key</i>
                Look  up  the  data stored under the requested key.
diff -cr /tmp/postfix-2.1.1/html/qmgr.8.html ./html/qmgr.8.html
*** /tmp/postfix-2.1.1/html/qmgr.8.html	Wed Apr 14 10:40:01 2004
--- ./html/qmgr.8.html	Mon Jun 14 17:18:56 2004
***************
*** 63,70 ****
                <a href="defer.8.html"><b>defer</b>(8)</a> daemon.
  
         <b>trace</b>  Per-recipient status information as requested  with
!               the  Postfix  "<b>sendmail  -v</b>" or "<b>sendmail -bv" com-</b>
!               <b>mand</b>.  These files are maintained by  the  <a href="trace.8.html"><b>trace</b>(8)</a>
                daemon.
  
         The  <b>qmgr</b>  daemon is responsible for asking the <a href="bounce.8.html"><b>bounce</b>(8)</a>,
--- 63,70 ----
                <a href="defer.8.html"><b>defer</b>(8)</a> daemon.
  
         <b>trace</b>  Per-recipient status information as requested  with
!               the  Postfix  "<b>sendmail  -v</b>" or "<b>sendmail -bv</b>" com-
!               mand.  These files are maintained by  the  <a href="trace.8.html"><b>trace</b>(8)</a>
                daemon.
  
         The  <b>qmgr</b>  daemon is responsible for asking the <a href="bounce.8.html"><b>bounce</b>(8)</a>,
***************
*** 365,371 ****
  <b>SEE ALSO</b>
         <a href="trivial-rewrite.8.html">trivial-rewrite(8)</a>, address routing
         <a href="bounce.8.html">bounce(8)</a>, delivery status reports
!        <a href="postconf.5.html">postconf(5)</a> configuration parameters
         <a href="master.8.html">master(8)</a>, process manager
         syslogd(8) system logging
  
--- 365,371 ----
  <b>SEE ALSO</b>
         <a href="trivial-rewrite.8.html">trivial-rewrite(8)</a>, address routing
         <a href="bounce.8.html">bounce(8)</a>, delivery status reports
!        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
         <a href="master.8.html">master(8)</a>, process manager
         syslogd(8) system logging
  
diff -cr /tmp/postfix-2.1.1/html/smtpd.8.html ./html/smtpd.8.html
*** /tmp/postfix-2.1.1/html/smtpd.8.html	Mon May  3 13:21:16 2004
--- ./html/smtpd.8.html	Mon Jun 14 17:38:32 2004
***************
*** 434,439 ****
--- 434,441 ----
                Postfix SMTP server starts to increment  the  error
                counter with each junk command.
  
+        Available in Postfix version 2.1 and later:
+ 
         <b><a href="postconf.5.html#smtpd_recipient_overshoot_limit">smtpd_recipient_overshoot_limit</a> (1000)</b>
                The  number of recipients that a remote SMTP client
                can send in excess  of  the  limit  specified  with
***************
*** 447,458 ****
         outside  Postfix.   See  the  file <a href="SMTPD_POLICY_README.html">SMTPD_POLICY_README</a> for
         more information.
  
-        <b><a href="postconf.5.html#smtpd_policy_service_timeout">smtpd_policy_service_timeout</a> (100s)</b>
-               The time limit for connecting  to,  writing  to  or
-               receiving from a delegated SMTPD policy server.
- 
         <b><a href="postconf.5.html#smtpd_policy_service_max_idle">smtpd_policy_service_max_idle</a> (300s)</b>
!               The  time  after which an idle SMTPD policy service
                connection is closed.
  
         <b><a href="postconf.5.html#smtpd_policy_service_max_ttl">smtpd_policy_service_max_ttl</a> (1000s)</b>
--- 449,456 ----
         outside  Postfix.   See  the  file <a href="SMTPD_POLICY_README.html">SMTPD_POLICY_README</a> for
         more information.
  
         <b><a href="postconf.5.html#smtpd_policy_service_max_idle">smtpd_policy_service_max_idle</a> (300s)</b>
!               The time after which an idle SMTPD  policy  service
                connection is closed.
  
         <b><a href="postconf.5.html#smtpd_policy_service_max_ttl">smtpd_policy_service_max_ttl</a> (1000s)</b>
***************
*** 460,566 ****
                connection is closed.
  
         <b><a href="postconf.5.html#smtpd_policy_service_timeout">smtpd_policy_service_timeout</a> (100s)</b>
!               The  time  limit  for  connecting to, writing to or
                receiving from a delegated SMTPD policy server.
  
  <b>ACCESS CONTROLS</b>
!        The <a href="SMTPD_ACCESS_README.html">SMTPD_ACCESS_README</a> document gives an introduction  to
         all the SMTP server access control features.
  
         <b><a href="postconf.5.html#smtpd_delay_reject">smtpd_delay_reject</a> (yes)</b>
!               Wait  until  the  RCPT TO command before evaluating
                $<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a>,    $smtpd_helo_restric-
                tions and $<a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a>, or wait until
!               the     ETRN     command     before      evaluating
                $<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> and $smtpd_helo_restric-
                tions.
  
!        <b><a href="postconf.5.html#parent_domain_matches_subdomains">parent_domain_matches_subdomains</a> (see 'postconf  -d'  out-</b>
         <b>put)</b>
                What   Postfix   features   match   subdomains   of
                "domain.tld" automatically, instead of requiring an
                explicit ".domain.tld" pattern.
  
         <b><a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> (empty)</b>
!               Optional SMTP server  access  restrictions  in  the
                context of a client SMTP connection request.
  
         <b><a href="postconf.5.html#smtpd_helo_required">smtpd_helo_required</a> (no)</b>
                Require that a remote SMTP client introduces itself
!               at the beginning of an SMTP session with  the  HELO
                or EHLO command.
  
         <b><a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> (empty)</b>
!               Optional  restrictions that the Postfix SMTP server
                applies in the context of the SMTP HELO command.
  
         <b><a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a> (empty)</b>
!               Optional restrictions that the Postfix SMTP  server
                applies in the context of the MAIL FROM command.
  
         <b><a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a>           (<a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>,</b>
         <b><a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a>)</b>
                The  access  restrictions  that  the  Postfix  SMTP
!               server applies in the context of the RCPT  TO  com-
                mand.
  
         <b><a href="postconf.5.html#smtpd_etrn_restrictions">smtpd_etrn_restrictions</a> (empty)</b>
!               Optional  SMTP  server  access  restrictions in the
                context of a client ETRN request.
  
         <b><a href="postconf.5.html#allow_untrusted_routing">allow_untrusted_routing</a> (no)</b>
!               Forward   mail   with   sender-specified    routing
!               (user[@%!]remote[@%!]site)  from  untrusted clients
                to destinations matching $<a href="postconf.5.html#relay_domains">relay_domains</a>.
  
         <b><a href="postconf.5.html#smtpd_restriction_classes">smtpd_restriction_classes</a> (empty)</b>
!               User-defined aliases for groups of access  restric-
                tions.
  
         <b><a href="postconf.5.html#smtpd_null_access_lookup_key">smtpd_null_access_lookup_key</a> (</b>&lt;&gt;<b>)</b>
!               The  lookup key to be used in SMTP <a href="access.5.html">access(5)</a> tables
                instead of the null sender address.
  
         <b><a href="postconf.5.html#permit_mx_backup_networks">permit_mx_backup_networks</a> (empty)</b>
                Restrict  the  use  of  the  <a href="postconf.5.html#permit_mx_backup">permit_mx_backup</a>  SMTP
!               access  feature  to  only  domains whose primary MX
                hosts match the listed networks.
  
         Available in Postfix version 2.0 and later:
  
         <b><a href="postconf.5.html#smtpd_data_restrictions">smtpd_data_restrictions</a> (empty)</b>
!               Optional access restrictions that the Postfix  SMTP
                server applies in the context of the SMTP DATA com-
                mand.
  
         <b><a href="postconf.5.html#smtpd_expansion_filter">smtpd_expansion_filter</a> (see 'postconf -d' output)</b>
!               What characters are allowed in $name expansions  of
                RBL reply templates.
  
         Available in Postfix version 2.1 and later:
  
         <b><a href="postconf.5.html#smtpd_reject_unlisted_sender">smtpd_reject_unlisted_sender</a> (no)</b>
!               Request  that  the Postfix SMTP server rejects mail
!               from  unknown  sender  addresses,  even   when   no
!               explicit  <a href="postconf.5.html#reject_unlisted_sender">reject_unlisted_sender</a> access restriction
                is specified.
  
         <b><a href="postconf.5.html#smtpd_reject_unlisted_recipient">smtpd_reject_unlisted_recipient</a> (yes)</b>
!               Request that the Postfix SMTP server  rejects  mail
                for  unknown  recipient  addresses,  even  when  no
!               explicit <a href="postconf.5.html#reject_unlisted_recipient">reject_unlisted_recipient</a> access  restric-
                tion is specified.
  
  <b>SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS</b>
!        Postfix  version 2.1 introduces sender and address verifi-
!        cation.  This feature  is  implemented  by  sending  probe
!        email messages that are not actually delivered.  This fea-
!        ture is requested  via  the  <a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a>  and
!        <a href="postconf.5.html#reject_unverified_recipient">reject_unverified_recipient</a> access restrictions.  The sta-
!        tus of verification probes is maintained by the  <a href="verify.8.html">verify(8)</a>
!        server.   See  the  file  <a href="ADDRESS_VERIFICATION_README.html">ADDRESS_VERIFICATION_README</a>  for
!        information about how to configure and operate the Postfix
!        sender/recipient address verification service.
  
         <b><a href="postconf.5.html#address_verify_poll_count">address_verify_poll_count</a> (3)</b>
                How  many  times to query the <a href="verify.8.html">verify(8)</a> service for
--- 458,565 ----
                connection is closed.
  
         <b><a href="postconf.5.html#smtpd_policy_service_timeout">smtpd_policy_service_timeout</a> (100s)</b>
!               The time limit for connecting  to,  writing  to  or
                receiving from a delegated SMTPD policy server.
  
  <b>ACCESS CONTROLS</b>
!        The  <a href="SMTPD_ACCESS_README.html">SMTPD_ACCESS_README</a> document gives an introduction to
         all the SMTP server access control features.
  
         <b><a href="postconf.5.html#smtpd_delay_reject">smtpd_delay_reject</a> (yes)</b>
!               Wait until the RCPT TO  command  before  evaluating
                $<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a>,    $smtpd_helo_restric-
                tions and $<a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a>, or wait until
!               the      ETRN     command     before     evaluating
                $<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> and $smtpd_helo_restric-
                tions.
  
!        <b><a href="postconf.5.html#parent_domain_matches_subdomains">parent_domain_matches_subdomains</a>  (see  'postconf -d' out-</b>
         <b>put)</b>
                What   Postfix   features   match   subdomains   of
                "domain.tld" automatically, instead of requiring an
                explicit ".domain.tld" pattern.
  
         <b><a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> (empty)</b>
!               Optional  SMTP  server  access  restrictions in the
                context of a client SMTP connection request.
  
         <b><a href="postconf.5.html#smtpd_helo_required">smtpd_helo_required</a> (no)</b>
                Require that a remote SMTP client introduces itself
!               at  the  beginning of an SMTP session with the HELO
                or EHLO command.
  
         <b><a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> (empty)</b>
!               Optional restrictions that the Postfix SMTP  server
                applies in the context of the SMTP HELO command.
  
         <b><a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a> (empty)</b>
!               Optional  restrictions that the Postfix SMTP server
                applies in the context of the MAIL FROM command.
  
         <b><a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a>           (<a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>,</b>
         <b><a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a>)</b>
                The  access  restrictions  that  the  Postfix  SMTP
!               server  applies  in the context of the RCPT TO com-
                mand.
  
         <b><a href="postconf.5.html#smtpd_etrn_restrictions">smtpd_etrn_restrictions</a> (empty)</b>
!               Optional SMTP server  access  restrictions  in  the
                context of a client ETRN request.
  
         <b><a href="postconf.5.html#allow_untrusted_routing">allow_untrusted_routing</a> (no)</b>
!               Forward    mail   with   sender-specified   routing
!               (user[@%!]remote[@%!]site) from  untrusted  clients
                to destinations matching $<a href="postconf.5.html#relay_domains">relay_domains</a>.
  
         <b><a href="postconf.5.html#smtpd_restriction_classes">smtpd_restriction_classes</a> (empty)</b>
!               User-defined  aliases for groups of access restric-
                tions.
  
         <b><a href="postconf.5.html#smtpd_null_access_lookup_key">smtpd_null_access_lookup_key</a> (</b>&lt;&gt;<b>)</b>
!               The lookup key to be used in SMTP <a href="access.5.html">access(5)</a>  tables
                instead of the null sender address.
  
         <b><a href="postconf.5.html#permit_mx_backup_networks">permit_mx_backup_networks</a> (empty)</b>
                Restrict  the  use  of  the  <a href="postconf.5.html#permit_mx_backup">permit_mx_backup</a>  SMTP
!               access feature to only  domains  whose  primary  MX
                hosts match the listed networks.
  
         Available in Postfix version 2.0 and later:
  
         <b><a href="postconf.5.html#smtpd_data_restrictions">smtpd_data_restrictions</a> (empty)</b>
!               Optional  access restrictions that the Postfix SMTP
                server applies in the context of the SMTP DATA com-
                mand.
  
         <b><a href="postconf.5.html#smtpd_expansion_filter">smtpd_expansion_filter</a> (see 'postconf -d' output)</b>
!               What  characters are allowed in $name expansions of
                RBL reply templates.
  
         Available in Postfix version 2.1 and later:
  
         <b><a href="postconf.5.html#smtpd_reject_unlisted_sender">smtpd_reject_unlisted_sender</a> (no)</b>
!               Request that the Postfix SMTP server  rejects  mail
!               from   unknown   sender  addresses,  even  when  no
!               explicit <a href="postconf.5.html#reject_unlisted_sender">reject_unlisted_sender</a> access  restriction
                is specified.
  
         <b><a href="postconf.5.html#smtpd_reject_unlisted_recipient">smtpd_reject_unlisted_recipient</a> (yes)</b>
!               Request  that  the Postfix SMTP server rejects mail
                for  unknown  recipient  addresses,  even  when  no
!               explicit  <a href="postconf.5.html#reject_unlisted_recipient">reject_unlisted_recipient</a> access restric-
                tion is specified.
  
  <b>SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS</b>
!        Postfix  version  2.1  introduces  sender  and   recipient
!        address  verification.   This  feature  is  implemented by
!        sending probe email messages that are not actually  deliv-
!        ered.   This  feature  is requested via the <a href="postconf.5.html#reject_unverified_sender">reject_unveri</a>-
!        <a href="postconf.5.html#reject_unverified_sender">fied_sender</a>   and    <a href="postconf.5.html#reject_unverified_recipient">reject_unverified_recipient</a>    access
!        restrictions.   The status of verification probes is main-
!        tained by the <a href="verify.8.html">verify(8)</a> server.  See the file ADDRESS_VER-
!        <a href="IFICATION_README.html">IFICATION_README</a>  for  information  about how to configure
!        and operate the Postfix sender/recipient address verifica-
!        tion service.
  
         <b><a href="postconf.5.html#address_verify_poll_count">address_verify_poll_count</a> (3)</b>
                How  many  times to query the <a href="verify.8.html">verify(8)</a> service for
diff -cr /tmp/postfix-2.1.1/html/spawn.8.html ./html/spawn.8.html
*** /tmp/postfix-2.1.1/html/spawn.8.html	Wed Apr 14 10:40:05 2004
--- ./html/spawn.8.html	Mon Jun 14 17:18:59 2004
***************
*** 66,72 ****
         data-driven attacks.
  
  <b>CONFIGURATION PARAMETERS</b>
!        Changes to <b>main.cf</b> are picked up automatically as <a href="smtpd.8.html">smtpd(8)</a>
         processes run for only a limited amount of time.  Use  the
         command "<b>postfix reload</b>" to speed up a change.
  
--- 66,72 ----
         data-driven attacks.
  
  <b>CONFIGURATION PARAMETERS</b>
!        Changes to <b>main.cf</b> are picked up automatically as <a href="spawn.8.html">spawn(8)</a>
         processes run for only a limited amount of time.  Use  the
         command "<b>postfix reload</b>" to speed up a change.
  
diff -cr /tmp/postfix-2.1.1/html/trivial-rewrite.8.html ./html/trivial-rewrite.8.html
*** /tmp/postfix-2.1.1/html/trivial-rewrite.8.html	Wed Apr 14 10:40:04 2004
--- ./html/trivial-rewrite.8.html	Mon Jun 14 17:18:59 2004
***************
*** 156,168 ****
                destination).
  
  <b>ADDRESS VERIFICATION CONTROLS</b>
!        Postfix version 2.1 introduces sender and address  verifi-
!        cation.   This  feature  is  implemented  by sending probe
!        email  messages  that  are  not  actually  delivered.   By
!        default, address verification probes use the same route as
!        regular mail. To  override  specific  aspects  of  message
!        routing  for  address  verification probes, specify one or
!        more of the following:
  
         <b><a href="postconf.5.html#address_verify_local_transport">address_verify_local_transport</a> ($<a href="postconf.5.html#local_transport">local_transport</a>)</b>
                Overrides the <a href="postconf.5.html#local_transport">local_transport</a> parameter setting for
--- 156,168 ----
                destination).
  
  <b>ADDRESS VERIFICATION CONTROLS</b>
!        Postfix  version  2.1  introduces  sender  and   recipient
!        address  verification.   This  feature  is  implemented by
!        sending probe email messages that are not actually  deliv-
!        ered.   By  default,  address  verification probes use the
!        same route as regular mail. To override  specific  aspects
!        of  message routing for address verification probes, spec-
!        ify one or more of the following:
  
         <b><a href="postconf.5.html#address_verify_local_transport">address_verify_local_transport</a> ($<a href="postconf.5.html#local_transport">local_transport</a>)</b>
                Overrides the <a href="postconf.5.html#local_transport">local_transport</a> parameter setting for
diff -cr /tmp/postfix-2.1.1/man/man5/header_checks.5 ./man/man5/header_checks.5
*** /tmp/postfix-2.1.1/man/man5/header_checks.5	Wed Apr 21 19:07:13 2004
--- ./man/man5/header_checks.5	Fri May  7 15:25:22 2004
***************
*** 292,300 ****
  .nf
  /etc/postfix/main.cf:
  .ti +4
! header_checks = regexp:/etc/postfix/header_checks
  
! /etc/postfix/header_checks:
  .ti +4
  /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
  .ti +8
--- 292,300 ----
  .nf
  /etc/postfix/main.cf:
  .ti +4
! body_checks = regexp:/etc/postfix/body_checks
  
! /etc/postfix/body_checks:
  .ti +4
  /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
  .ti +8
diff -cr /tmp/postfix-2.1.1/man/man5/postconf.5 ./man/man5/postconf.5
*** /tmp/postfix-2.1.1/man/man5/postconf.5	Thu Apr 22 19:11:57 2004
--- ./man/man5/postconf.5	Mon Jun 14 17:18:53 2004
***************
*** 388,393 ****
--- 388,394 ----
  pattern is replaced by its contents; a "type:table" lookup table
  is matched when a table entry matches a lookup string (the lookup
  result is ignored).  Continue long lines by starting the next line
+ with whitespace.
  .SH backwards_bounce_logfile_compatibility (default: yes)
  Produce additional bounce(8) logfile records that can be read by
  older Postfix versions. The current and more extensible "name =
***************
*** 796,802 ****
  The names of message delivery transports that should not be delivered
  to unless someone issues "\fBsendmail -q\fR" or equivalent. Specify zero
  or more names of mail delivery transports names that appear in the
! first field of master.cf).
  .PP
  Example:
  .PP
--- 797,803 ----
  The names of message delivery transports that should not be delivered
  to unless someone issues "\fBsendmail -q\fR" or equivalent. Specify zero
  or more names of mail delivery transports names that appear in the
! first field of master.cf.
  .PP
  Example:
  .PP
***************
*** 1969,1975 ****
  Send the postmaster copies of the headers of bounced mail, and
  send transcripts of SMTP sessions when Postfix rejects mail. The
  notification is sent to the address specified with the
! bounce_notice_recipient configuration parameter (default: postmaster)
  .IP "\fB2bounce\fR"
  Send undeliverable bounced mail to the postmaster. The notification
  is sent to the address specified with the 2bounce_notice_recipient
--- 1970,1976 ----
  Send the postmaster copies of the headers of bounced mail, and
  send transcripts of SMTP sessions when Postfix rejects mail. The
  notification is sent to the address specified with the
! bounce_notice_recipient configuration parameter (default: postmaster).
  .IP "\fB2bounce\fR"
  Send undeliverable bounced mail to the postmaster. The notification
  is sent to the address specified with the 2bounce_notice_recipient
***************
*** 2365,2377 ****
  recipients. See also the relay domains address class in the
  ADDRESS_CLASS_README file.
  .PP
- The list of domains that are by default delivered via the
- $local_transport mail delivery transport. By default this is the
- Postfix local(8) delivery agent which looks up all recipients in
- /etc/passwd and /etc/aliases. The SMTP server validates recipient
- addresses with $local_recipient_maps. See also the local domain
- address class in the ADDRESS_CLASS_README file.
- .PP
  NOTE: Postfix will not automatically forward mail for domains
  that list this system as their primary or backup MX host. See the
  permit_mx_backup restriction in the postconf(5) manual page.
--- 2366,2371 ----
***************
*** 2721,2727 ****
  This feature is available in Postfix 2.1 and later.
  .SH smtp_line_length_limit (default: 990)
  The maximal length of message header and body lines that Postfix
! will send via SMTP.  Longer lines are longer are broken by inserting
  "<CR><LF><SPACE>". This minimizes the damage to
  MIME formatted mail.
  .PP
--- 2715,2721 ----
  This feature is available in Postfix 2.1 and later.
  .SH smtp_line_length_limit (default: 990)
  The maximal length of message header and body lines that Postfix
! will send via SMTP.  Longer lines are broken by inserting
  "<CR><LF><SPACE>". This minimizes the damage to
  MIME formatted mail.
  .PP
***************
*** 2988,2994 ****
  .PP
  By default, clients in trusted networks are excluded. Specify a
  list of network blocks, hostnames or .domain names (the initial
! initial dot causes the domain to match any name below it).
  .PP
  This feature is not part of the stable Postfix 2.1 release.
  .SH smtpd_client_connection_rate_limit (default: 0)
--- 2982,2988 ----
  .PP
  By default, clients in trusted networks are excluded. Specify a
  list of network blocks, hostnames or .domain names (the initial
! dot causes the domain to match any name below it).
  .PP
  This feature is not part of the stable Postfix 2.1 release.
  .SH smtpd_client_connection_rate_limit (default: 0)
***************
*** 3370,3376 ****
  supposed to give the result to another Postfix SMTP server process.
  .PP
  Specify host:port. The host can be specified as an IP address
! or was a symbolic name; no MX lookups are done. When no host or
  host:  are specified, the local machine is assumed.
  .PP
  This feature is available in Postfix 2.1 and later.
--- 3364,3370 ----
  supposed to give the result to another Postfix SMTP server process.
  .PP
  Specify host:port. The host can be specified as an IP address
! or as a symbolic name; no MX lookups are done. When no host or
  host:  are specified, the local machine is assumed.
  .PP
  This feature is available in Postfix 2.1 and later.
***************
*** 3507,3515 ****
  The unknown_address_reject_code parameter specifies
  the response code for rejected requests (default: 450).  The response
  is always 450 in case of a temporary DNS error.
! .IP "\fBreject_unlisted_recipient\fR
! (Postfix 2.0 name: check_recipient_maps)"
!  Reject the request when the RCPT TO address is not listed in
  the list of valid recipients for its domain class. See the
  smtpd_reject_unlisted_recipient parameter description for details.
  This feature is available in Postfix 2.1 and later.
--- 3501,3508 ----
  The unknown_address_reject_code parameter specifies
  the response code for rejected requests (default: 450).  The response
  is always 450 in case of a temporary DNS error.
! .IP "\fBreject_unlisted_recipient\fR (Postfix 2.0 name: check_recipient_maps)"
! Reject the request when the RCPT TO address is not listed in
  the list of valid recipients for its domain class. See the
  smtpd_reject_unlisted_recipient parameter description for details.
  This feature is available in Postfix 2.1 and later.
diff -cr /tmp/postfix-2.1.1/man/man8/pickup.8 ./man/man8/pickup.8
*** /tmp/postfix-2.1.1/man/man8/pickup.8	Sun Apr 11 15:56:53 2004
--- ./man/man8/pickup.8	Mon Jun 14 17:18:53 2004
***************
*** 51,57 ****
  .nf
  .ad
  .fi
! As the pickup daemon is a relatively long-running process, up
  to an hour may pass before a \fBmain.cf\fR change takes effect.
  Use the command "\fBpostfix reload\fR" command to speed up a change.
  
--- 51,57 ----
  .nf
  .ad
  .fi
! As the pickup(8) daemon is a relatively long-running process, up
  to an hour may pass before a \fBmain.cf\fR change takes effect.
  Use the command "\fBpostfix reload\fR" command to speed up a change.
  
diff -cr /tmp/postfix-2.1.1/man/man8/proxymap.8 ./man/man8/proxymap.8
*** /tmp/postfix-2.1.1/man/man8/proxymap.8	Sun Apr 11 12:08:52 2004
--- ./man/man8/proxymap.8	Mon Jun 14 17:18:54 2004
***************
*** 42,49 ****
  .IP "\fBopen\fR \fImaptype:mapname flags\fR"
  Open the table with type \fImaptype\fR and name \fImapname\fR,
  as controlled by \fIflags\fR. The reply includes the \fImaptype\fR
! dependent flags (to distinguish a fixed string table from regular
! a expression table).
  .IP "\fBlookup\fR \fImaptype:mapname flags key\fR"
  Look up the data stored under the requested key.
  The reply is the request completion status code (below) and
--- 42,49 ----
  .IP "\fBopen\fR \fImaptype:mapname flags\fR"
  Open the table with type \fImaptype\fR and name \fImapname\fR,
  as controlled by \fIflags\fR. The reply includes the \fImaptype\fR
! dependent flags (to distinguish a fixed string table from a regular
! expression table).
  .IP "\fBlookup\fR \fImaptype:mapname flags key\fR"
  Look up the data stored under the requested key.
  The reply is the request completion status code (below) and
diff -cr /tmp/postfix-2.1.1/man/man8/qmgr.8 ./man/man8/qmgr.8
*** /tmp/postfix-2.1.1/man/man8/qmgr.8	Wed Apr 14 10:27:46 2004
--- ./man/man8/qmgr.8	Mon Jun 14 17:18:54 2004
***************
*** 60,66 ****
  These files are maintained by the \fBdefer\fR(8) daemon.
  .IP \fBtrace\fR
  Per-recipient status information as requested with the
! Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv" command\fR.
  These files are maintained by the \fBtrace\fR(8) daemon.
  .PP
  The \fBqmgr\fR daemon is responsible for asking the
--- 60,66 ----
  These files are maintained by the \fBdefer\fR(8) daemon.
  .IP \fBtrace\fR
  Per-recipient status information as requested with the
! Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command.
  These files are maintained by the \fBtrace\fR(8) daemon.
  .PP
  The \fBqmgr\fR daemon is responsible for asking the
***************
*** 325,331 ****
  .nf
  trivial-rewrite(8), address routing
  bounce(8), delivery status reports
! postconf(5) configuration parameters
  master(8), process manager
  syslogd(8) system logging
  .SH "README FILES"
--- 325,331 ----
  .nf
  trivial-rewrite(8), address routing
  bounce(8), delivery status reports
! postconf(5), configuration parameters
  master(8), process manager
  syslogd(8) system logging
  .SH "README FILES"
diff -cr /tmp/postfix-2.1.1/man/man8/smtpd.8 ./man/man8/smtpd.8
*** /tmp/postfix-2.1.1/man/man8/smtpd.8	Thu Apr 22 19:11:57 2004
--- ./man/man8/smtpd.8	Mon Jun 14 17:38:30 2004
***************
*** 374,379 ****
--- 374,381 ----
  The number of junk commands (NOOP, VRFY, ETRN or RSET) that a remote
  SMTP client can send before the Postfix SMTP server starts to
  increment the error counter with each junk command.
+ .PP
+ Available in Postfix version 2.1 and later:
  .IP "\fBsmtpd_recipient_overshoot_limit (1000)\fR"
  The number of recipients that a remote SMTP client can send in
  excess of the limit specified with $smtpd_recipient_limit, before
***************
*** 387,395 ****
  As of version 2.1, Postfix can be configured to delegate access
  policy decisions to an external server that runs outside Postfix.
  See the file SMTPD_POLICY_README for more information.
- .IP "\fBsmtpd_policy_service_timeout (100s)\fR"
- The time limit for connecting to, writing to or receiving from a
- delegated SMTPD policy server.
  .IP "\fBsmtpd_policy_service_max_idle (300s)\fR"
  The time after which an idle SMTPD policy service connection is
  closed.
--- 389,394 ----
***************
*** 466,472 ****
  .nf
  .ad
  .fi
! Postfix version 2.1 introduces sender and address verification.
  This feature is implemented by sending probe email messages that
  are not actually delivered.
  This feature is requested via the reject_unverified_sender and
--- 465,471 ----
  .nf
  .ad
  .fi
! Postfix version 2.1 introduces sender and recipient address verification.
  This feature is implemented by sending probe email messages that
  are not actually delivered.
  This feature is requested via the reject_unverified_sender and
diff -cr /tmp/postfix-2.1.1/man/man8/spawn.8 ./man/man8/spawn.8
*** /tmp/postfix-2.1.1/man/man8/spawn.8	Sun Apr 11 15:17:44 2004
--- ./man/man8/spawn.8	Mon Jun 14 17:18:54 2004
***************
*** 69,75 ****
  .nf
  .ad
  .fi
! Changes to \fBmain.cf\fR are picked up automatically as smtpd(8)
  processes run for only a limited amount of time. Use the command
  "\fBpostfix reload\fR" to speed up a change.
  
--- 69,75 ----
  .nf
  .ad
  .fi
! Changes to \fBmain.cf\fR are picked up automatically as spawn(8)
  processes run for only a limited amount of time. Use the command
  "\fBpostfix reload\fR" to speed up a change.
  
diff -cr /tmp/postfix-2.1.1/man/man8/trivial-rewrite.8 ./man/man8/trivial-rewrite.8
*** /tmp/postfix-2.1.1/man/man8/trivial-rewrite.8	Wed Apr 14 10:27:46 2004
--- ./man/man8/trivial-rewrite.8	Mon Jun 14 17:18:54 2004
***************
*** 144,150 ****
  .nf
  .ad
  .fi
! Postfix version 2.1 introduces sender and address verification.
  This feature is implemented by sending probe email messages that
  are not actually delivered.
  By default, address verification probes use the same route
--- 144,150 ----
  .nf
  .ad
  .fi
! Postfix version 2.1 introduces sender and recipient address verification.
  This feature is implemented by sending probe email messages that
  are not actually delivered.
  By default, address verification probes use the same route
diff -cr /tmp/postfix-2.1.1/mantools/postconf2man ./mantools/postconf2man
*** /tmp/postfix-2.1.1/mantools/postconf2man	Thu Mar 25 20:59:37 2004
--- ./mantools/postconf2man	Tue May  4 15:49:06 2004
***************
*** 57,63 ****
      #$block =~ s/<\/ul>/\n.PP\n/g;
      $block =~ s/<\/dl>/\n/g;
      $block =~ s/<\/ul>/\n/g;
!     $block =~ s/<dd>/\n/g;
      $block =~ s/<\/dd>/\n/g;
      $block =~ s/<li>\s*/\n.IP \\(bu\n/g;
      $block =~ s/<dt>\s*/\n.IP "/g;
--- 57,63 ----
      #$block =~ s/<\/ul>/\n.PP\n/g;
      $block =~ s/<\/dl>/\n/g;
      $block =~ s/<\/ul>/\n/g;
!     $block =~ s/<dd>\s*/\n/g;
      $block =~ s/<\/dd>/\n/g;
      $block =~ s/<li>\s*/\n.IP \\(bu\n/g;
      $block =~ s/<dt>\s*/\n.IP "/g;
diff -cr /tmp/postfix-2.1.1/proto/header_checks ./proto/header_checks
*** /tmp/postfix-2.1.1/proto/header_checks	Wed Apr 21 19:03:41 2004
--- ./proto/header_checks	Fri May  7 15:24:35 2004
***************
*** 272,280 ****
  # .nf
  #	/etc/postfix/main.cf:
  # .ti +4
! #	header_checks = regexp:/etc/postfix/header_checks
  #
! #	/etc/postfix/header_checks:
  # .ti +4
  #	/^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
  # .ti +8
--- 272,280 ----
  # .nf
  #	/etc/postfix/main.cf:
  # .ti +4
! #	body_checks = regexp:/etc/postfix/body_checks
  #
! #	/etc/postfix/body_checks:
  # .ti +4
  #	/^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
  # .ti +8
diff -cr /tmp/postfix-2.1.1/proto/postconf.proto ./proto/postconf.proto
*** /tmp/postfix-2.1.1/proto/postconf.proto	Thu Apr 22 19:10:02 2004
--- ./proto/postconf.proto	Mon Jun 14 17:17:40 2004
***************
*** 1010,1016 ****
  The names of message delivery transports that should not be delivered
  to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero
  or more names of mail delivery transports names that appear in the
! first field of master.cf).
  </p>
  
  <p>
--- 1010,1016 ----
  The names of message delivery transports that should not be delivered
  to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero
  or more names of mail delivery transports names that appear in the
! first field of master.cf.
  </p>
  
  <p>
***************
*** 2406,2412 ****
  <dd>Send the postmaster copies of the headers of bounced mail, and
  send transcripts of SMTP sessions when Postfix rejects mail. The
  notification is sent to the address specified with the
! bounce_notice_recipient configuration parameter (default: postmaster)
  </dd>
  
  <dt><b>2bounce</b></dt>
--- 2406,2412 ----
  <dd>Send the postmaster copies of the headers of bounced mail, and
  send transcripts of SMTP sessions when Postfix rejects mail. The
  notification is sent to the address specified with the
! bounce_notice_recipient configuration parameter (default: postmaster).
  </dd>
  
  <dt><b>2bounce</b></dt>
***************
*** 2829,2841 ****
  recipients. See also the relay domains address class in the
  ADDRESS_CLASS_README file.  </p>
  
- <p> The list of domains that are by default delivered via the
- $local_transport mail delivery transport. By default this is the
- Postfix local(8) delivery agent which looks up all recipients in
- /etc/passwd and /etc/aliases. The SMTP server validates recipient
- addresses with $local_recipient_maps. See also the local domain
- address class in the ADDRESS_CLASS_README file.  </p>
- 
  <p> NOTE: Postfix will not automatically forward mail for domains
  that list this system as their primary or backup MX host. See the
  permit_mx_backup restriction in the postconf(5) manual page.  </p>
--- 2829,2834 ----
***************
*** 3327,3333 ****
  
  <p>
  The maximal length of message header and body lines that Postfix
! will send via SMTP.  Longer lines are longer are broken by inserting
  "&lt;CR&gt;&lt;LF&gt;&lt;SPACE&gt;". This minimizes the damage to
  MIME formatted mail.
  </p>
--- 3320,3326 ----
  
  <p>
  The maximal length of message header and body lines that Postfix
! will send via SMTP.  Longer lines are broken by inserting
  "&lt;CR&gt;&lt;LF&gt;&lt;SPACE&gt;". This minimizes the damage to
  MIME formatted mail.
  </p>
***************
*** 3611,3616 ****
--- 3604,3610 ----
  pattern is replaced by its contents; a "type:table" lookup table
  is matched when a table entry matches a lookup string (the lookup
  result is ignored).  Continue long lines by starting the next line
+ with whitespace. </p>
  
  %PARAM smtpd_authorized_verp_clients $authorized_verp_clients
  
***************
*** 3742,3748 ****
  <p>
  By default, clients in trusted networks are excluded. Specify a
  list of network blocks, hostnames or .domain names (the initial
! initial dot causes the domain to match any name below it).
  </p>
  
  <p>
--- 3736,3742 ----
  <p>
  By default, clients in trusted networks are excluded. Specify a
  list of network blocks, hostnames or .domain names (the initial
! dot causes the domain to match any name below it).
  </p>
  
  <p>
***************
*** 4268,4274 ****
  </p>
  
  <p> Specify host:port. The host can be specified as an IP address
! or was a symbolic name; no MX lookups are done. When no host or
  host:  are specified, the local machine is assumed.  </p>
  
  <p> This feature is available in Postfix 2.1 and later.  </p>
--- 4262,4268 ----
  </p>
  
  <p> Specify host:port. The host can be specified as an IP address
! or as a symbolic name; no MX lookups are done. When no host or
  host:  are specified, the local machine is assumed.  </p>
  
  <p> This feature is available in Postfix 2.1 and later.  </p>
***************
*** 4444,4451 ****
  the response code for rejected requests (default: 450).  The response
  is always 450 in case of a temporary DNS error.</dd>
  
! <dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b>
! (Postfix 2.0 name: check_recipient_maps)</dt>
  
  <dd> Reject the request when the RCPT TO address is not listed in
  the list of valid recipients for its domain class. See the
--- 4438,4444 ----
  the response code for rejected requests (default: 450).  The response
  is always 450 in case of a temporary DNS error.</dd>
  
! <dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (Postfix 2.0 name: check_recipient_maps)</dt>
  
  <dd> Reject the request when the RCPT TO address is not listed in
  the list of valid recipients for its domain class. See the
diff -cr /tmp/postfix-2.1.1/src/global/bounce.c ./src/global/bounce.c
*** /tmp/postfix-2.1.1/src/global/bounce.c	Sat Sep 20 17:39:39 2003
--- ./src/global/bounce.c	Mon Jun 14 11:07:17 2004
***************
*** 257,266 ****
  			     ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why),
  				ATTR_TYPE_END) == 0
  	    && ((flags & DEL_REQ_FLAG_RECORD) == 0
! 		|| vtrace_append(flags, id, orig_rcpt, recipient, relay,
! 			      entry, dsn_code, dsn_action, fmt, ap) == 0)) {
! 	    vlog_adhoc(id, orig_rcpt, recipient, relay,
! 		       entry, log_status, fmt, ap);
  	    status = (var_soft_bounce ? -1 : 0);
  	} else if ((flags & BOUNCE_FLAG_CLEAN) == 0) {
  	    status = defer_append(flags, id, orig_rcpt, recipient, offset,
--- 257,267 ----
  			     ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why),
  				ATTR_TYPE_END) == 0
  	    && ((flags & DEL_REQ_FLAG_RECORD) == 0
! 		|| trace_append(flags, id, orig_rcpt, recipient, relay,
! 				entry, dsn_code, dsn_action,
! 				"%s", vstring_str(why)) == 0)) {
! 	    log_adhoc(id, orig_rcpt, recipient, relay,
! 		      entry, log_status, "%s", vstring_str(why));
  	    status = (var_soft_bounce ? -1 : 0);
  	} else if ((flags & BOUNCE_FLAG_CLEAN) == 0) {
  	    status = defer_append(flags, id, orig_rcpt, recipient, offset,
***************
*** 384,393 ****
  			     ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why),
  				ATTR_TYPE_END) == 0
  	    && ((flags & DEL_REQ_FLAG_RECORD) == 0
! 		|| vtrace_append(flags, id, orig_rcpt, recipient, relay,
! 				 entry, "5.0.0", "failed", fmt, ap) == 0)) {
! 	    vlog_adhoc(id, orig_rcpt, recipient, relay,
! 		       entry, "bounced", fmt, ap);
  	    status = 0;
  	} else if ((flags & BOUNCE_FLAG_CLEAN) == 0) {
  	    status = defer_append(flags, id, orig_rcpt, recipient, offset,
--- 385,395 ----
  			     ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why),
  				ATTR_TYPE_END) == 0
  	    && ((flags & DEL_REQ_FLAG_RECORD) == 0
! 		|| trace_append(flags, id, orig_rcpt, recipient, relay,
! 				entry, "5.0.0", "failed",
! 				"%s", vstring_str(why)) == 0)) {
! 	    log_adhoc(id, orig_rcpt, recipient, relay,
! 		      entry, "bounced", "%s", vstring_str(why));
  	    status = 0;
  	} else if ((flags & BOUNCE_FLAG_CLEAN) == 0) {
  	    status = defer_append(flags, id, orig_rcpt, recipient, offset,
diff -cr /tmp/postfix-2.1.1/src/global/defer.c ./src/global/defer.c
*** /tmp/postfix-2.1.1/src/global/defer.c	Sun Sep 21 19:43:38 2003
--- ./src/global/defer.c	Mon Jun 14 11:10:49 2004
***************
*** 224,237 ****
  			     ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why),
  				ATTR_TYPE_END) != 0)
  	    msg_warn("%s: %s service failure", id, var_defer_service);
! 	vlog_adhoc(id, orig_rcpt, recipient, relay, entry, "deferred", fmt, ap);
  
  	/*
  	 * Traced delivery.
  	 */
  	if (flags & DEL_REQ_FLAG_RECORD)
! 	    if (vtrace_append(flags, id, orig_rcpt, recipient, relay,
! 			      entry, "4.0.0", "deferred", fmt, ap) != 0)
  		msg_warn("%s: %s service failure", id, var_trace_service);
  
  	/*
--- 224,239 ----
  			     ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why),
  				ATTR_TYPE_END) != 0)
  	    msg_warn("%s: %s service failure", id, var_defer_service);
! 	log_adhoc(id, orig_rcpt, recipient, relay, entry, "deferred",
! 		  "%s", vstring_str(why));
  
  	/*
  	 * Traced delivery.
  	 */
  	if (flags & DEL_REQ_FLAG_RECORD)
! 	    if (trace_append(flags, id, orig_rcpt, recipient, relay,
! 			     entry, "4.0.0", "deferred",
! 			     "%s", vstring_str(why)) != 0)
  		msg_warn("%s: %s service failure", id, var_trace_service);
  
  	/*
diff -cr /tmp/postfix-2.1.1/src/global/sent.c ./src/global/sent.c
*** /tmp/postfix-2.1.1/src/global/sent.c	Sat Sep 20 17:43:30 2003
--- ./src/global/sent.c	Mon Jun 14 13:19:19 2004
***************
*** 161,177 ****
       * Normal mail delivery. May also send a delivery record to the user.
       */
      else {
  	if ((flags & DEL_REQ_FLAG_RECORD) == 0
! 	    || vtrace_append(flags, id, orig_rcpt, recipient, relay,
! 			     entry, "2.0.0", "delivered", fmt, ap) == 0) {
! 	    vlog_adhoc(id, orig_rcpt, recipient, relay,
! 		       entry, "sent", fmt, ap);
  	    status = 0;
  	} else {
  	    status = defer_append(flags, id, orig_rcpt, recipient, offset,
  				  relay, entry, "%s: %s service failed",
  				  id, var_trace_service);
  	}
  	return (status);
      }
  }
--- 161,182 ----
       * Normal mail delivery. May also send a delivery record to the user.
       */
      else {
+ 	VSTRING *text = vstring_alloc(10);
+ 
+ 	vstring_vsprintf(text, fmt, ap);
  	if ((flags & DEL_REQ_FLAG_RECORD) == 0
! 	    || trace_append(flags, id, orig_rcpt, recipient, relay,
! 			    entry, "2.0.0", "delivered",
! 			    "%s", vstring_str(text)) == 0) {
! 	    log_adhoc(id, orig_rcpt, recipient, relay,
! 		      entry, "sent", "%s", vstring_str(text));
  	    status = 0;
  	} else {
  	    status = defer_append(flags, id, orig_rcpt, recipient, offset,
  				  relay, entry, "%s: %s service failed",
  				  id, var_trace_service);
  	}
+ 	vstring_free(text);
  	return (status);
      }
  }
diff -cr /tmp/postfix-2.1.1/src/global/trace.c ./src/global/trace.c
*** /tmp/postfix-2.1.1/src/global/trace.c	Sun Sep 21 20:32:41 2003
--- ./src/global/trace.c	Mon Jun 14 11:05:32 2004
***************
*** 172,179 ****
  	req_stat = -1;
      } else {
  	if (flags & DEL_REQ_FLAG_EXPAND)
! 	    vlog_adhoc(queue_id, orig_rcpt, recipient, relay,
! 		       entry, dsn_action, fmt, ap);
  	req_stat = 0;
      }
      vstring_free(why);
--- 172,179 ----
  	req_stat = -1;
      } else {
  	if (flags & DEL_REQ_FLAG_EXPAND)
! 	    log_adhoc(queue_id, orig_rcpt, recipient, relay,
! 		      entry, dsn_action, "%s", vstring_str(why));
  	req_stat = 0;
      }
      vstring_free(why);
diff -cr /tmp/postfix-2.1.1/src/global/verify.c ./src/global/verify.c
*** /tmp/postfix-2.1.1/src/global/verify.c	Tue Nov 19 11:12:44 2002
--- ./src/global/verify.c	Mon Jun 14 13:20:02 2004
***************
*** 134,159 ****
  		              time_t entry, const char *status,
  		              int rcpt_stat, const char *fmt, va_list ap)
  {
      int     req_stat;
  
      /*
       * Impedance adaptor between bounce/defer/sent and verify_clnt.
       */
      if (var_verify_neg_cache || rcpt_stat == DEL_RCPT_STAT_OK) {
  	req_stat = verify_clnt_vupdate(orig_rcpt, rcpt_stat, fmt, ap);
  	if (req_stat == VRFY_STAT_OK && strcasecmp(recipient, orig_rcpt) != 0)
! 	    req_stat = verify_clnt_vupdate(recipient, rcpt_stat, fmt, ap);
      } else {
  	status = "undeliverable-but-not-cached";
  	req_stat = VRFY_STAT_OK;
      }
      if (req_stat == VRFY_STAT_OK) {
! 	vlog_adhoc(queue_id, orig_rcpt, recipient, relay,
! 		   entry, status, fmt, ap);
  	req_stat = 0;
      } else {
  	msg_warn("%s: %s service failure", queue_id, var_verify_service);
  	req_stat = -1;
      }
      return (req_stat);
  }
--- 134,163 ----
  		              time_t entry, const char *status,
  		              int rcpt_stat, const char *fmt, va_list ap)
  {
+     VSTRING *text = vstring_alloc(10);
      int     req_stat;
  
      /*
       * Impedance adaptor between bounce/defer/sent and verify_clnt.
       */
+     vstring_vsprintf(text, fmt, ap);
      if (var_verify_neg_cache || rcpt_stat == DEL_RCPT_STAT_OK) {
  	req_stat = verify_clnt_vupdate(orig_rcpt, rcpt_stat, fmt, ap);
  	if (req_stat == VRFY_STAT_OK && strcasecmp(recipient, orig_rcpt) != 0)
! 	    req_stat = verify_clnt_update(recipient, rcpt_stat,
! 					  "%s", vstring_str(text));
      } else {
  	status = "undeliverable-but-not-cached";
  	req_stat = VRFY_STAT_OK;
      }
      if (req_stat == VRFY_STAT_OK) {
! 	log_adhoc(queue_id, orig_rcpt, recipient, relay,
! 		  entry, status, "%s", vstring_str(text));
  	req_stat = 0;
      } else {
  	msg_warn("%s: %s service failure", queue_id, var_verify_service);
  	req_stat = -1;
      }
+     vstring_free(text);
      return (req_stat);
  }
diff -cr /tmp/postfix-2.1.1/src/pickup/pickup.c ./src/pickup/pickup.c
*** /tmp/postfix-2.1.1/src/pickup/pickup.c	Sun Apr 11 15:56:52 2004
--- ./src/pickup/pickup.c	Mon Jun 14 17:17:40 2004
***************
*** 35,41 ****
  /* CONFIGURATION PARAMETERS
  /* .ad
  /* .fi
! /*	As the pickup daemon is a relatively long-running process, up
  /*	to an hour may pass before a \fBmain.cf\fR change takes effect.
  /*	Use the command "\fBpostfix reload\fR" command to speed up a change.
  /*
--- 35,41 ----
  /* CONFIGURATION PARAMETERS
  /* .ad
  /* .fi
! /*	As the pickup(8) daemon is a relatively long-running process, up
  /*	to an hour may pass before a \fBmain.cf\fR change takes effect.
  /*	Use the command "\fBpostfix reload\fR" command to speed up a change.
  /*
diff -cr /tmp/postfix-2.1.1/src/proxymap/proxymap.c ./src/proxymap/proxymap.c
*** /tmp/postfix-2.1.1/src/proxymap/proxymap.c	Sun Apr 11 12:08:50 2004
--- ./src/proxymap/proxymap.c	Mon Jun 14 17:17:40 2004
***************
*** 36,43 ****
  /* .IP "\fBopen\fR \fImaptype:mapname flags\fR"
  /*	Open the table with type \fImaptype\fR and name \fImapname\fR,
  /*	as controlled by \fIflags\fR. The reply includes the \fImaptype\fR
! /*	dependent flags (to distinguish a fixed string table from regular
! /*	a expression table).
  /* .IP "\fBlookup\fR \fImaptype:mapname flags key\fR"
  /*	Look up the data stored under the requested key.
  /*	The reply is the request completion status code (below) and
--- 36,43 ----
  /* .IP "\fBopen\fR \fImaptype:mapname flags\fR"
  /*	Open the table with type \fImaptype\fR and name \fImapname\fR,
  /*	as controlled by \fIflags\fR. The reply includes the \fImaptype\fR
! /*	dependent flags (to distinguish a fixed string table from a regular
! /*	expression table).
  /* .IP "\fBlookup\fR \fImaptype:mapname flags key\fR"
  /*	Look up the data stored under the requested key.
  /*	The reply is the request completion status code (below) and
diff -cr /tmp/postfix-2.1.1/src/qmgr/qmgr.c ./src/qmgr/qmgr.c
*** /tmp/postfix-2.1.1/src/qmgr/qmgr.c	Wed Apr 14 10:25:42 2004
--- ./src/qmgr/qmgr.c	Mon Jun 14 17:17:41 2004
***************
*** 50,56 ****
  /*	These files are maintained by the \fBdefer\fR(8) daemon.
  /* .IP \fBtrace\fR
  /*	Per-recipient status information as requested with the
! /*	Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv" command\fR.
  /*	These files are maintained by the \fBtrace\fR(8) daemon.
  /* .PP
  /*	The \fBqmgr\fR daemon is responsible for asking the
--- 50,56 ----
  /*	These files are maintained by the \fBdefer\fR(8) daemon.
  /* .IP \fBtrace\fR
  /*	Per-recipient status information as requested with the
! /*	Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command.
  /*	These files are maintained by the \fBtrace\fR(8) daemon.
  /* .PP
  /*	The \fBqmgr\fR daemon is responsible for asking the
***************
*** 283,289 ****
  /* SEE ALSO
  /*	trivial-rewrite(8), address routing
  /*	bounce(8), delivery status reports
! /*	postconf(5) configuration parameters
  /*	master(8), process manager
  /*	syslogd(8) system logging
  /* README FILES
--- 283,289 ----
  /* SEE ALSO
  /*	trivial-rewrite(8), address routing
  /*	bounce(8), delivery status reports
! /*	postconf(5), configuration parameters
  /*	master(8), process manager
  /*	syslogd(8) system logging
  /* README FILES
diff -cr /tmp/postfix-2.1.1/src/smtp/smtp_connect.c ./src/smtp/smtp_connect.c
*** /tmp/postfix-2.1.1/src/smtp/smtp_connect.c	Thu Mar 25 13:07:35 2004
--- ./src/smtp/smtp_connect.c	Mon Jun 14 16:14:40 2004
***************
*** 349,354 ****
--- 349,355 ----
  	    if (++addr_count == var_smtp_mxaddr_limit)
  		next = 0;
  	    if ((state->session = smtp_connect_addr(addr, port, why)) != 0) {
+ 		state->features = 0;		/* XXX should be SESSION info */
  		if (++sess_count == var_smtp_mxsess_limit)
  		    next = 0;
  		state->final_server = (cpp[1] == 0 && next == 0);
***************
*** 356,368 ****
  		debug_peer_check(state->session->host, state->session->addr);
  		if (smtp_helo(state, misc_flags) == 0)
  		    smtp_xfer(state);
! 		if (state->history != 0
! 		    && (state->error_mask & name_mask(VAR_NOTIFY_CLASSES,
! 				     mail_error_masks, var_notify_classes)))
! 		    smtp_chat_notify(state);
  		/* XXX smtp_xfer() may abort in the middle of DATA. */
  		smtp_session_free(state->session);
  		state->session = 0;
  		debug_peer_restore();
  		smtp_rcpt_cleanup(state);
  	    } else {
--- 357,374 ----
  		debug_peer_check(state->session->host, state->session->addr);
  		if (smtp_helo(state, misc_flags) == 0)
  		    smtp_xfer(state);
! 		if (state->history != 0) {
! 		    if (state->error_mask & name_mask(VAR_NOTIFY_CLASSES,
! 				      mail_error_masks, var_notify_classes))
! 			smtp_chat_notify(state);
! 		    smtp_chat_reset(state);
! 		}
  		/* XXX smtp_xfer() may abort in the middle of DATA. */
  		smtp_session_free(state->session);
  		state->session = 0;
+ #ifdef USE_SASL_AUTH
+ 		smtp_sasl_cleanup(state);
+ #endif
  		debug_peer_restore();
  		smtp_rcpt_cleanup(state);
  	    } else {
diff -cr /tmp/postfix-2.1.1/src/smtpd/smtpd.c ./src/smtpd/smtpd.c
*** /tmp/postfix-2.1.1/src/smtpd/smtpd.c	Wed Apr 21 17:10:01 2004
--- ./src/smtpd/smtpd.c	Mon Jun 14 17:38:17 2004
***************
*** 338,343 ****
--- 338,345 ----
  /*	The number of junk commands (NOOP, VRFY, ETRN or RSET) that a remote
  /*	SMTP client can send before the Postfix SMTP server starts to
  /*	increment the error counter with each junk command.
+ /* .PP
+ /*	Available in Postfix version 2.1 and later:
  /* .IP "\fBsmtpd_recipient_overshoot_limit (1000)\fR"
  /*	The number of recipients that a remote SMTP client can send in
  /*	excess of the limit specified with $smtpd_recipient_limit, before
***************
*** 349,357 ****
  /*	As of version 2.1, Postfix can be configured to delegate access
  /*	policy decisions to an external server that runs outside Postfix.
  /*	See the file SMTPD_POLICY_README for more information.
- /* .IP "\fBsmtpd_policy_service_timeout (100s)\fR"
- /*	The time limit for connecting to, writing to or receiving from a
- /*	delegated SMTPD policy server.
  /* .IP "\fBsmtpd_policy_service_max_idle (300s)\fR"
  /*	The time after which an idle SMTPD policy service connection is
  /*	closed.
--- 351,356 ----
***************
*** 424,430 ****
  /* SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS
  /* .ad
  /* .fi
! /*	Postfix version 2.1 introduces sender and address verification.
  /*	This feature is implemented by sending probe email messages that
  /*	are not actually delivered.
  /*	This feature is requested via the reject_unverified_sender and
--- 423,429 ----
  /* SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS
  /* .ad
  /* .fi
! /*	Postfix version 2.1 introduces sender and recipient address verification.
  /*	This feature is implemented by sending probe email messages that
  /*	are not actually delivered.
  /*	This feature is requested via the reject_unverified_sender and
diff -cr /tmp/postfix-2.1.1/src/smtpd/smtpd_proxy.h ./src/smtpd/smtpd_proxy.h
*** /tmp/postfix-2.1.1/src/smtpd/smtpd_proxy.h	Sat Jul  5 10:20:20 2003
--- ./src/smtpd/smtpd_proxy.h	Mon Jun 14 17:28:50 2004
***************
*** 24,32 ****
  #define SMTPD_PROX_WANT_MORE	'3'	/* Expect 3XX reply */
  
  extern int smtpd_proxy_open(SMTPD_STATE *, const char *, int, const char *, const char *);
! extern int smtpd_proxy_cmd(SMTPD_STATE *, int, const char *,...);
  extern int smtpd_proxy_rec_put(VSTREAM *, int, const char *, int);
! extern int smtpd_proxy_rec_fprintf(VSTREAM *, int, const char *,...);
  extern void smtpd_proxy_close(SMTPD_STATE *);
  
  /* LICENSE
--- 24,32 ----
  #define SMTPD_PROX_WANT_MORE	'3'	/* Expect 3XX reply */
  
  extern int smtpd_proxy_open(SMTPD_STATE *, const char *, int, const char *, const char *);
! extern int PRINTFLIKE(3, 4) smtpd_proxy_cmd(SMTPD_STATE *, int, const char *,...);
  extern int smtpd_proxy_rec_put(VSTREAM *, int, const char *, int);
! extern int PRINTFLIKE(3, 4) smtpd_proxy_rec_fprintf(VSTREAM *, int, const char *,...);
  extern void smtpd_proxy_close(SMTPD_STATE *);
  
  /* LICENSE
diff -cr /tmp/postfix-2.1.1/src/spawn/spawn.c ./src/spawn/spawn.c
*** /tmp/postfix-2.1.1/src/spawn/spawn.c	Sun Apr 11 15:17:44 2004
--- ./src/spawn/spawn.c	Mon Jun 14 17:17:41 2004
***************
*** 53,59 ****
  /* CONFIGURATION PARAMETERS
  /* .ad
  /* .fi
! /*	Changes to \fBmain.cf\fR are picked up automatically as smtpd(8)
  /*	processes run for only a limited amount of time. Use the command
  /*	"\fBpostfix reload\fR" to speed up a change.
  /*
--- 53,59 ----
  /* CONFIGURATION PARAMETERS
  /* .ad
  /* .fi
! /*	Changes to \fBmain.cf\fR are picked up automatically as spawn(8)
  /*	processes run for only a limited amount of time. Use the command
  /*	"\fBpostfix reload\fR" to speed up a change.
  /*
diff -cr /tmp/postfix-2.1.1/src/trivial-rewrite/trivial-rewrite.c ./src/trivial-rewrite/trivial-rewrite.c
*** /tmp/postfix-2.1.1/src/trivial-rewrite/trivial-rewrite.c	Wed Apr 14 10:25:42 2004
--- ./src/trivial-rewrite/trivial-rewrite.c	Mon Jun 14 17:17:41 2004
***************
*** 120,126 ****
  /* ADDRESS VERIFICATION CONTROLS
  /* .ad
  /* .fi
! /*	Postfix version 2.1 introduces sender and address verification.
  /*	This feature is implemented by sending probe email messages that
  /*	are not actually delivered.
  /*	By default, address verification probes use the same route
--- 120,126 ----
  /* ADDRESS VERIFICATION CONTROLS
  /* .ad
  /* .fi
! /*	Postfix version 2.1 introduces sender and recipient address verification.
  /*	This feature is implemented by sending probe email messages that
  /*	are not actually delivered.
  /*	By default, address verification probes use the same route
diff -cr /tmp/postfix-2.1.1/src/util/sys_defs.h ./src/util/sys_defs.h
*** /tmp/postfix-2.1.1/src/util/sys_defs.h	Wed Apr 14 15:49:40 2004
--- ./src/util/sys_defs.h	Mon Jun 14 14:13:40 2004
***************
*** 50,57 ****
  #endif
  #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
! #define USE_STATFS
! #define STATFS_IN_SYS_MOUNT_H
  #define HAS_POSIX_REGEXP
  #define HAS_ST_GEN	/* struct stat contains inode generation number */
  #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
--- 50,62 ----
  #endif
  #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
! #if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
! # define USE_STATVFS
! # define STATVFS_IN_SYS_STATVFS_H
! #else
! # define USE_STATFS
! # define STATFS_IN_SYS_MOUNT_H
! #endif
  #define HAS_POSIX_REGEXP
  #define HAS_ST_GEN	/* struct stat contains inode generation number */
  #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"