postfix-2.4-20060903

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 5f0dc360a816c88d83eb730b7141406d3d0259eb..5a4e44d962bb757534f257ec8a92b2c79ce555bc 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -12719,8 +12719,37 @@ Apologies for any names omitted.
        files. Files with too many backward jumps are saved to the
        "corrupt" directory.  File: global/record.c.
 
+20060831
+
+       Bugfix (introduced with initial implementation): missing
+       "dict_errno = 0" caused mis-leading error messages after
+       non-error lookup failure.  Victor Duchovni.  File:
+       util/dict_cidr.c.
+
+       Robustness: the default TLS cipher lists were changed from
+       !foo:ALL into ALL:!foo. Victor Duchovni.  Files:
+       global/mail_params.h and documentation.
+
+20060902
+
+       Bugfix (introduced Postfix 2.3): the LMTP client stripped
+       "inet": from the next-hop destination, but still used the
+       complete next-hop from the delivery request. File:
+       smtp/smtp_connect.c.
+
+20060903
+
+       Cleanup: record loop detection.  File: global/record.c.
+
 Wish list:
 
+       Either document or remove the internal_mail_filter_classes
+       feature (it's disabled by default).
+
+       Build a command-line test driver for the cleanup engine.
+       This allows us to generate arbitrary record sequences without
+       having to hijack mail from the queue.
+
        Make null local-part handling configurable: either expand
        into mailer-daemon (current bahavior) or disallow (strict
        behavior, currently implemented only in the SMTP server).

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 3b2d15490500e1800b3ed25ebfbfb8df906754cf..83636dd82a32eb89131b0f9f87d09df6774b7f28 100644 (file)
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -11604,7 +11604,7 @@ strongly encouraged to not change this setting. </p>
 </DD>
 
 <DT><b><a name="tls_high_cipherlist">tls_high_cipherlist</a>
-(default: !EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)</b></DT><DD>
+(default: ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)</b></DT><DD>
 
 <p> The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
 the meaning of the "high" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,
@@ -11617,7 +11617,7 @@ strongly encouraged to not change this setting. </p>
 </DD>
 
 <DT><b><a name="tls_low_cipherlist">tls_low_cipherlist</a>
-(default: !EXPORT:ALL:+RC4:@STRENGTH)</b></DT><DD>
+(default: ALL:!EXPORT:+RC4:@STRENGTH)</b></DT><DD>
 
 <p> The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
 the meaning of the "low" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,
@@ -11630,7 +11630,7 @@ strongly encouraged to not change this setting. </p>
 </DD>
 
 <DT><b><a name="tls_medium_cipherlist">tls_medium_cipherlist</a>
-(default: !EXPORT:!LOW:ALL:+RC4:@STRENGTH)</b></DT><DD>
+(default: ALL:!EXPORT:!LOW:+RC4:@STRENGTH)</b></DT><DD>
 
 <p> The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
 defines the meaning of the "medium" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,

diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html
index c2e465ded725408e06248b7b060029be1ee0d063..96428e6105faa569a8e45a27612c527cc8bc1943 100644 (file)
--- a/postfix/html/sendmail.1.html
+++ b/postfix/html/sendmail.1.html
@@ -120,48 +120,49 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               files.
 
        <b>-F</b> <i>full</i><b>_</b><i>name</i>
-              Set the sender full name. This is  used  only  with
-              messages that have no <b>From:</b> message header.
+              Set the sender full name. This overrides  the  NAME
+              environment  variable,  and  is used only with mes-
+              sages that have no <b>From:</b> message header.
 
        <b>-f</b> <i>sender</i>
               Set  the  envelope  sender  address.  This  is  the
-              address where delivery problems are sent  to.  With
+              address  where  delivery problems are sent to. With
               Postfix versions before 2.1, the <b>Errors-To:</b> message
               header overrides the error return address.
 
-       <b>-G</b>     Gateway (relay) submission, as opposed  to  initial
-              user  submission.   Either do not rewrite addresses
-              at all, or update  incomplete  addresses  with  the
+       <b>-G</b>     Gateway  (relay)  submission, as opposed to initial
+              user submission.  Either do not  rewrite  addresses
+              at  all,  or  update  incomplete addresses with the
               domain information specified with <b>remote_header_re-</b>
               <b>write_domain</b>.
 
-              This option is ignored before Postfix version  2.3.
+              This  option is ignored before Postfix version 2.3.
 
        <b>-h</b> <i>hop</i><b>_</b><i>count</i> (ignored)
-              Hop  count limit. Use the <b><a href="postconf.5.html#hopcount_limit">hopcount_limit</a></b> configura-
+              Hop count limit. Use the <b><a href="postconf.5.html#hopcount_limit">hopcount_limit</a></b>  configura-
               tion parameter instead.
 
-       <b>-I</b>     Initialize alias database. See the <b>newaliases</b>  com-
+       <b>-I</b>     Initialize  alias database. See the <b>newaliases</b> com-
               mand above.
 
-       <b>-i</b>     When  reading  a message from standard input, don't
-              treat a line with only a <b>.</b> character as the end  of
+       <b>-i</b>     When reading a message from standard  input,  don't
+              treat  a line with only a <b>.</b> character as the end of
               input.
 
        <b>-L</b> <i>label</i> (ignored)
-              The  logging  label. Use the <b><a href="postconf.5.html#syslog_name">syslog_name</a></b> configura-
+              The logging label. Use the  <b><a href="postconf.5.html#syslog_name">syslog_name</a></b>  configura-
               tion parameter instead.
 
        <b>-m</b> (ignored)
               Backwards compatibility.
 
        <b>-N</b> <i>dsn</i> (default: 'delay, failure')
-              Delivery  status  notification   control.   Specify
-              either  a  comma-separated list with one or more of
-              <b>failure</b> (send notification  when  delivery  fails),
+              Delivery   status   notification  control.  Specify
+              either a comma-separated list with one or  more  of
+              <b>failure</b>  (send  notification  when delivery fails),
               <b>delay</b> (send notification when delivery is delayed),
-              or <b>success</b> (send notification when the  message  is
-              delivered);  or specify <b>never</b> (don't send any noti-
+              or  <b>success</b>  (send notification when the message is
+              delivered); or specify <b>never</b> (don't send any  noti-
               fications at all).
 
               This feature is available in Postfix 2.3 and later.
@@ -170,7 +171,7 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               Backwards compatibility.
 
        <b>-oA</b><i>alias</i><b>_</b><i>database</i>
-              Non-default  alias  database.  Specify  <i>pathname</i> or
+              Non-default alias  database.  Specify  <i>pathname</i>  or
               <i>type</i>:<i>pathname</i>. See <a href="postalias.1.html"><b>postalias</b>(1)</a> for details.
 
        <b>-O</b> <i>option=value</i> (ignored)
@@ -180,60 +181,60 @@ SENDMAIL(1)                                                        SENDMAIL(1)
 
        <b>-o8</b> (ignored)
               To send 8-bit or binary content, use an appropriate
-              MIME  encapsulation  and specify the appropriate <b>-B</b>
+              MIME encapsulation and specify the  appropriate  <b>-B</b>
               command-line option.
 
-       <b>-oi</b>    When reading a message from standard  input,  don't
-              treat  a line with only a <b>.</b> character as the end of
+       <b>-oi</b>    When  reading  a message from standard input, don't
+              treat a line with only a <b>.</b> character as the end  of
               input.
 
        <b>-om</b> (ignored)
-              The sender is  never  eliminated  from  alias  etc.
+              The  sender  is  never  eliminated  from alias etc.
               expansions.
 
        <b>-o</b> <i>x value</i> (ignored)
-              Set  option <i>x</i> to <i>value</i>. Use the equivalent configu-
+              Set option <i>x</i> to <i>value</i>. Use the equivalent  configu-
               ration parameter in <a href="postconf.5.html"><b>main.cf</b></a> instead.
 
        <b>-r</b> <i>sender</i>
               Set  the  envelope  sender  address.  This  is  the
-              address  where  delivery problems are sent to. With
+              address where delivery problems are sent  to.  With
               Postfix versions before 2.1, the <b>Errors-To:</b> message
               header overrides the error return address.
 
        <b>-R</b> <i>return</i><b>_</b><i>limit</i> (ignored)
-              Limit   the   size   of   bounced   mail.  Use  the
-              <b><a href="postconf.5.html#bounce_size_limit">bounce_size_limit</a></b> configuration parameter  instead.
+              Limit  the  size   of   bounced   mail.   Use   the
+              <b><a href="postconf.5.html#bounce_size_limit">bounce_size_limit</a></b>  configuration parameter instead.
 
-       <b>-q</b>     Attempt  to deliver all queued mail. This is imple-
+       <b>-q</b>     Attempt to deliver all queued mail. This is  imple-
               mented by executing the <a href="postqueue.1.html"><b>postqueue</b>(1)</a> command.
 
               Warning:  flushing  undeliverable  mail  frequently
-              will  result  in  poor  delivery performance of all
+              will result in poor  delivery  performance  of  all
               other mail.
 
        <b>-q</b><i>interval</i> (ignored)
-              The  interval   between   queue   runs.   Use   the
+              The   interval   between   queue   runs.   Use  the
               <b><a href="postconf.5.html#queue_run_delay">queue_run_delay</a></b> configuration parameter instead.
 
        <b>-qR</b><i>site</i>
-              Schedule  immediate  delivery  of  all mail that is
+              Schedule immediate delivery of  all  mail  that  is
               queued for the named <i>site</i>. This option accepts only
-              <i>site</i>  names  that are eligible for the "fast flush"
-              service,  and  is  implemented  by  executing   the
+              <i>site</i> names that are eligible for the  "fast  flush"
+              service,   and  is  implemented  by  executing  the
               <a href="postqueue.1.html"><b>postqueue</b>(1)</a> command.  See <a href="flush.8.html"><b>flush</b>(8)</a> for more infor-
               mation about the "fast flush" service.
 
        <b>-qS</b><i>site</i>
-              This command is not  implemented.  Use  the  slower
+              This  command  is  not  implemented. Use the slower
               "<b>sendmail -q</b>" command instead.
 
-       <b>-t</b>     Extract  recipients from message headers. These are
-              added to any recipients specified  on  the  command
+       <b>-t</b>     Extract recipients from message headers. These  are
+              added  to  any  recipients specified on the command
               line.
 
-              With  Postfix  versions  prior  to 2.1, this option
-              requires that no recipient addresses are  specified
+              With Postfix versions prior  to  2.1,  this  option
+              requires  that no recipient addresses are specified
               on the command line.
 
        <b>-U</b> (ignored)
@@ -246,63 +247,67 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               This feature is available in Postfix 2.3 and later.
 
        <b>-XV</b> (Postfix 2.2 and earlier: <b>-V</b>)
-              Variable  Envelope  Return  Path. Given an envelope
-              sender address of the  form  <i>owner-listname</i>@<i>origin</i>,
-              each  recipient  <i>user</i>@<i>domain</i>  receives  mail with a
+              Variable Envelope Return Path.  Given  an  envelope
+              sender  address  of the form <i>owner-listname</i>@<i>origin</i>,
+              each recipient <i>user</i>@<i>domain</i>  receives  mail  with  a
               personalized envelope sender address.
 
-              By  default,  the  personalized   envelope   sender
-              address  is  <i>owner-listname</i><b>+</b><i>user</i><b>=</b><i>domain</i>@<i>origin</i>. The
-              default <b>+</b> and <b>=</b> characters  are  configurable  with
-              the  <b><a href="postconf.5.html#default_verp_delimiters">default_verp_delimiters</a></b>  configuration parame-
+              By   default,   the  personalized  envelope  sender
+              address is  <i>owner-listname</i><b>+</b><i>user</i><b>=</b><i>domain</i>@<i>origin</i>.  The
+              default  <b>+</b>  and  <b>=</b> characters are configurable with
+              the <b><a href="postconf.5.html#default_verp_delimiters">default_verp_delimiters</a></b>  configuration  parame-
               ter.
 
        <b>-XV</b><i>xy</i> (Postfix 2.2 and earlier: <b>-V</b><i>xy</i>)
-              As <b>-XV</b>, but uses <i>x</i> and  <i>y</i>  as  the  VERP  delimiter
-              characters,  instead  of  the  characters specified
-              with  the   <b><a href="postconf.5.html#default_verp_delimiters">default_verp_delimiters</a></b>   configuration
+              As  <b>-XV</b>,  but  uses  <i>x</i>  and <i>y</i> as the VERP delimiter
+              characters, instead  of  the  characters  specified
+              with   the   <b><a href="postconf.5.html#default_verp_delimiters">default_verp_delimiters</a></b>  configuration
               parameter.
 
-       <b>-v</b>     Send  an email report of the first delivery attempt
-              (Postfix versions 2.1  and  later).  Mail  delivery
-              always  happens in the background. When multiple <b>-v</b>
+       <b>-v</b>     Send an email report of the first delivery  attempt
+              (Postfix  versions  2.1  and  later). Mail delivery
+              always happens in the background. When multiple  <b>-v</b>
               options  are  given,  enable  verbose  logging  for
               debugging purposes.
 
        <b>-X</b> <i>log</i><b>_</b><i>file</i> (ignored)
-              Log  mailer  traffic.  Use  the <b><a href="postconf.5.html#debug_peer_list">debug_peer_list</a></b> and
-              <b><a href="postconf.5.html#debug_peer_level">debug_peer_level</a></b> configuration parameters  instead.
+              Log mailer traffic.  Use  the  <b><a href="postconf.5.html#debug_peer_list">debug_peer_list</a></b>  and
+              <b><a href="postconf.5.html#debug_peer_level">debug_peer_level</a></b>  configuration parameters instead.
 
 <b>SECURITY</b>
-       By  design,  this  program  is not set-user (or group) id.
-       However, it must  handle  data  from  untrusted  users  or
-       untrusted  machines.   Thus, the usual precautions need to
+       By design, this program is not  set-user  (or  group)  id.
+       However,  it  must  handle  data  from  untrusted users or
+       untrusted machines.  Thus, the usual precautions  need  to
        be taken against malicious inputs.
 
 <b>DIAGNOSTICS</b>
-       Problems are logged to  <b>syslogd</b>(8)  and  to  the  standard
+       Problems  are  logged  to  <b>syslogd</b>(8)  and to the standard
        error stream.
 
 <b>ENVIRONMENT</b>
        <b>MAIL_CONFIG</b>
               Directory with Postfix configuration files.
 
-       <b>MAIL_VERBOSE</b>
+       <b>MAIL_VERBOSE</b> (value does not matter)
               Enable verbose logging for debugging purposes.
 
-       <b>MAIL_DEBUG</b>
+       <b>MAIL_DEBUG</b> (value does not matter)
               Enable debugging with an external command, as spec-
-              ified  with  the   <b><a href="postconf.5.html#debugger_command">debugger_command</a></b>   configuration
+              ified   with   the  <b><a href="postconf.5.html#debugger_command">debugger_command</a></b>  configuration
               parameter.
 
+       <b>NAME</b>   The sender full name. This is used only  with  mes-
+              sages  that  have no <b>From:</b> message header. See also
+              the <b>-F</b> option above.
+
 <b>CONFIGURATION PARAMETERS</b>
-       The  following  <a href="postconf.5.html"><b>main.cf</b></a> parameters are especially relevant
+       The following <a href="postconf.5.html"><b>main.cf</b></a> parameters are  especially  relevant
        to this program.  The text below provides only a parameter
-       summary.  See <a href="postconf.5.html"><b>postconf</b>(5)</a> for more details including exam-
+       summary. See <a href="postconf.5.html"><b>postconf</b>(5)</a> for more details including  exam-
        ples.
 
 <b>TROUBLE SHOOTING CONTROLS</b>
-       The <a href="DEBUG_README.html">DEBUG_README</a> file gives examples  of  how  to  trouble
+       The  <a href="DEBUG_README.html">DEBUG_README</a>  file  gives  examples of how to trouble
        shoot a Postfix system.
 
        <b><a href="postconf.5.html#debugger_command">debugger_command</a> (empty)</b>
@@ -310,29 +315,29 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               mon program is invoked with the -D option.
 
        <b><a href="postconf.5.html#debug_peer_level">debug_peer_level</a> (2)</b>
-              The increment  in  verbose  logging  level  when  a
-              remote  client  or  server matches a pattern in the
+              The  increment  in  verbose  logging  level  when a
+              remote client or server matches a  pattern  in  the
               <a href="postconf.5.html#debug_peer_list">debug_peer_list</a> parameter.
 
        <b><a href="postconf.5.html#debug_peer_list">debug_peer_list</a> (empty)</b>
-              Optional list of remote client or  server  hostname
-              or  network address patterns that cause the verbose
-              logging level to increase by the  amount  specified
+              Optional  list  of remote client or server hostname
+              or network address patterns that cause the  verbose
+              logging  level  to increase by the amount specified
               in $<a href="postconf.5.html#debug_peer_level">debug_peer_level</a>.
 
 <b>ACCESS CONTROLS</b>
        Available in Postfix version 2.2 and later:
 
        <b><a href="postconf.5.html#authorized_flush_users">authorized_flush_users</a> (static:anyone)</b>
-              List  of  users  who  are  authorized  to flush the
+              List of users  who  are  authorized  to  flush  the
               queue.
 
        <b><a href="postconf.5.html#authorized_mailq_users">authorized_mailq_users</a> (static:anyone)</b>
               List of users who are authorized to view the queue.
 
        <b><a href="postconf.5.html#authorized_submit_users">authorized_submit_users</a> (static:anyone)</b>
-              List  of  users  who  are authorized to submit mail
-              with the <a href="sendmail.1.html"><b>sendmail</b>(1)</a> command (and with  the  privi-
+              List of users who are  authorized  to  submit  mail
+              with  the  <a href="sendmail.1.html"><b>sendmail</b>(1)</a> command (and with the privi-
               leged <a href="postdrop.1.html"><b>postdrop</b>(1)</a> helper command).
 
 <b>RESOURCE AND RATE CONTROLS</b>
@@ -341,7 +346,7 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               sent in a non-delivery notification.
 
        <b><a href="postconf.5.html#fork_attempts">fork_attempts</a> (5)</b>
-              The maximal number of attempts to  fork()  a  child
+              The  maximal  number  of attempts to fork() a child
               process.
 
        <b><a href="postconf.5.html#fork_delay">fork_delay</a> (1s)</b>
@@ -349,11 +354,11 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               process.
 
        <b><a href="postconf.5.html#hopcount_limit">hopcount_limit</a> (50)</b>
-              The maximal number of  Received:   message  headers
+              The  maximal  number  of Received:  message headers
               that is allowed in the primary message headers.
 
        <b><a href="postconf.5.html#queue_run_delay">queue_run_delay</a> (1000s)</b>
-              The  time between <a href="QSHAPE_README.html#deferred_queue">deferred queue</a> scans by the queue
+              The time between <a href="QSHAPE_README.html#deferred_queue">deferred queue</a> scans by the  queue
               manager.
 
 <b>FAST FLUSH CONTROLS</b>
@@ -362,37 +367,37 @@ SENDMAIL(1)                                                        SENDMAIL(1)
 
        <b><a href="postconf.5.html#fast_flush_domains">fast_flush_domains</a> ($<a href="postconf.5.html#relay_domains">relay_domains</a>)</b>
               Optional list of destinations that are eligible for
-              per-destination logfiles with mail that  is  queued
+              per-destination  logfiles  with mail that is queued
               to those destinations.
 
 <b>VERP CONTROLS</b>
        The <a href="VERP_README.html">VERP_README</a> file describes configuration and operation
-       details of Postfix support for  variable  envelope  return
+       details  of  Postfix  support for variable envelope return
        path addresses.
 
        <b><a href="postconf.5.html#default_verp_delimiters">default_verp_delimiters</a> (+=)</b>
               The two default VERP delimiter characters.
 
        <b><a href="postconf.5.html#verp_delimiter_filter">verp_delimiter_filter</a> (-=+)</b>
-              The  characters  Postfix  accepts as VERP delimiter
-              characters on the Postfix <a href="sendmail.1.html"><b>sendmail</b>(1)</a> command  line
+              The characters Postfix accepts  as  VERP  delimiter
+              characters  on the Postfix <a href="sendmail.1.html"><b>sendmail</b>(1)</a> command line
               and in SMTP commands.
 
 <b>MISCELLANEOUS CONTROLS</b>
        <b><a href="postconf.5.html#alias_database">alias_database</a> (see 'postconf -d' output)</b>
-              The  alias databases for <a href="local.8.html"><b>local</b>(8)</a> delivery that are
+              The alias databases for <a href="local.8.html"><b>local</b>(8)</a> delivery that  are
               updated with "<b>newaliases</b>" or with "<b>sendmail -bi</b>".
 
        <b><a href="postconf.5.html#command_directory">command_directory</a> (see 'postconf -d' output)</b>
-              The location of  all  postfix  administrative  com-
+              The  location  of  all  postfix administrative com-
               mands.
 
        <b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
-              The  default  location  of  the Postfix <a href="postconf.5.html">main.cf</a> and
+              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_directory">daemon_directory</a> (see 'postconf -d' output)</b>
-              The directory with  Postfix  support  programs  and
+              The  directory  with  Postfix  support programs and
               daemon programs.
 
        <b><a href="postconf.5.html#default_database_type">default_database_type</a> (see 'postconf -d' output)</b>
@@ -400,16 +405,16 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               <a href="postalias.1.html"><b>postalias</b>(1)</a> and <a href="postmap.1.html"><b>postmap</b>(1)</a> commands.
 
        <b><a href="postconf.5.html#delay_warning_time">delay_warning_time</a> (0h)</b>
-              The time after which the sender receives  the  mes-
+              The  time  after which the sender receives the mes-
               sage headers of mail that is still queued.
 
        <b><a href="postconf.5.html#enable_errors_to">enable_errors_to</a> (no)</b>
-              Report  mail  delivery errors to the address speci-
-              fied  with  the  non-standard  Errors-To:   message
-              header,  instead  of  the  envelope  sender address
-              (this feature is removed with Postfix version  2.2,
-              is  turned off by default with Postfix version 2.1,
-              and is always turned on  with  older  Postfix  ver-
+              Report mail delivery errors to the  address  speci-
+              fied   with  the  non-standard  Errors-To:  message
+              header, instead  of  the  envelope  sender  address
+              (this  feature is removed with Postfix version 2.2,
+              is turned off by default with Postfix version  2.1,
+              and  is  always  turned  on with older Postfix ver-
               sions).
 
        <b><a href="postconf.5.html#mail_owner">mail_owner</a> (postfix)</b>
@@ -417,26 +422,26 @@ SENDMAIL(1)                                                        SENDMAIL(1)
               and most Postfix daemon processes.
 
        <b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b>
-              The location of the Postfix top-level queue  direc-
+              The  location of the Postfix top-level queue direc-
               tory.
 
        <b><a href="postconf.5.html#remote_header_rewrite_domain">remote_header_rewrite_domain</a> (empty)</b>
-              Don't  rewrite  message headers from remote clients
+              Don't rewrite message headers from  remote  clients
               at all when this parameter is empty; otherwise, re-
-              write  message  headers  and  append  the specified
+              write message  headers  and  append  the  specified
               domain name to incomplete addresses.
 
        <b><a href="postconf.5.html#syslog_facility">syslog_facility</a> (mail)</b>
               The syslog facility of Postfix logging.
 
        <b><a href="postconf.5.html#syslog_name">syslog_name</a> (postfix)</b>
-              The mail system  name  that  is  prepended  to  the
-              process  name  in  syslog  records, so that "smtpd"
+              The  mail  system  name  that  is  prepended to the
+              process name in syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
        <b><a href="postconf.5.html#trigger_timeout">trigger_timeout</a> (10s)</b>
-              The time limit for sending a trigger to  a  Postfix
-              daemon  (for example, the <a href="pickup.8.html"><b>pickup</b>(8)</a> or <a href="qmgr.8.html"><b>qmgr</b>(8)</a> dae-
+              The  time  limit for sending a trigger to a Postfix
+              daemon (for example, the <a href="pickup.8.html"><b>pickup</b>(8)</a> or <a href="qmgr.8.html"><b>qmgr</b>(8)</a>  dae-
               mon).
 
 <b>FILES</b>
@@ -461,7 +466,7 @@ SENDMAIL(1)                                                        SENDMAIL(1)
        <a href="VERP_README.html">VERP_README</a>, Postfix VERP howto
 
 <b>LICENSE</b>
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 <b>AUTHOR(S)</b>

diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html
index 9ea0a828c1672e4ff0dfbd8aa2728639917e5f19..fb57a3a860f0051db8336512804d82c829162a25 100644 (file)
--- a/postfix/html/smtp.8.html
+++ b/postfix/html/smtp.8.html
@@ -417,14 +417,14 @@ SMTP(8)                                                                SMTP(8)
               number generator (PRNG).
 
        <b><a href="postconf.5.html#tls_high_cipherlist">tls_high_cipherlist</a></b>
-       <b>(!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)</b>
+       <b>(ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)</b>
               The OpenSSL cipherlist for "HIGH" grade ciphers.
 
-       <b><a href="postconf.5.html#tls_medium_cipherlist">tls_medium_cipherlist</a> (!EXPORT:!LOW:ALL:+RC4:@STRENGTH)</b>
+       <b><a href="postconf.5.html#tls_medium_cipherlist">tls_medium_cipherlist</a> (ALL:!EXPORT:!LOW:+RC4:@STRENGTH)</b>
               The OpenSSL cipherlist for "MEDIUM" or higher grade
               ciphers.
 
-       <b><a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> (!EXPORT:ALL:+RC4:@STRENGTH)</b>
+       <b><a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> (ALL:!EXPORT:+RC4:@STRENGTH)</b>
               The  OpenSSL  cipherlist  for "LOW" or higher grade
               ciphers.
 

diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html
index 7092c7ba16153dfd97cfe3c48190d7f5108b1bf5..b4b0a63ed139651606adb5012b89fafb735f2824 100644 (file)
--- a/postfix/html/smtpd.8.html
+++ b/postfix/html/smtpd.8.html
@@ -456,14 +456,14 @@ SMTPD(8)                                                              SMTPD(8)
               number generator (PRNG).
 
        <b><a href="postconf.5.html#tls_high_cipherlist">tls_high_cipherlist</a></b>
-       <b>(!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)</b>
+       <b>(ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)</b>
               The OpenSSL cipherlist for "HIGH" grade ciphers.
 
-       <b><a href="postconf.5.html#tls_medium_cipherlist">tls_medium_cipherlist</a> (!EXPORT:!LOW:ALL:+RC4:@STRENGTH)</b>
+       <b><a href="postconf.5.html#tls_medium_cipherlist">tls_medium_cipherlist</a> (ALL:!EXPORT:!LOW:+RC4:@STRENGTH)</b>
               The OpenSSL cipherlist for "MEDIUM" or higher grade
               ciphers.
 
-       <b><a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> (!EXPORT:ALL:+RC4:@STRENGTH)</b>
+       <b><a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> (ALL:!EXPORT:+RC4:@STRENGTH)</b>
               The OpenSSL cipherlist for "LOW"  or  higher  grade
               ciphers.
 

diff --git a/postfix/makedefs b/postfix/makedefs
index 3c58c676b4ee90221f952b2246976cc4bb88f9da..595ef9dc52f3a7c31b1d33c518f205410e33679a 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -132,6 +132,8 @@ case "$SYSTEM.$RELEASE" in
                ;;
    NetBSD.3*)  SYSTYPE=NETBSD3
                ;;
+   NetBSD.4*)  SYSTYPE=NETBSD4
+               ;;
    BSD/OS.2*)  SYSTYPE=BSDI2
                ;;
    BSD/OS.3*)  SYSTYPE=BSDI3

diff --git a/postfix/man/man1/sendmail.1 b/postfix/man/man1/sendmail.1
index eba9b7f5436e21efd478880f78bd4cbbacdd66bb..827d483801a0c47b0bbd405c65dafbe652dd263b 100644 (file)
--- a/postfix/man/man1/sendmail.1
+++ b/postfix/man/man1/sendmail.1
@@ -101,7 +101,8 @@ With all Postfix versions, you can specify a directory pathname
 with the MAIL_CONFIG environment variable to override the
 location of configuration files.
 .IP "\fB-F \fIfull_name\fR
-Set the sender full name. This is used only with messages that
+Set the sender full name. This overrides the NAME environment
+variable, and is used only with messages that
 have no \fBFrom:\fR message header.
 .IP "\fB-f \fIsender\fR"
 Set the envelope sender address. This is the address where
@@ -239,11 +240,15 @@ stream.
 .fi
 .IP \fBMAIL_CONFIG\fR
 Directory with Postfix configuration files.
-.IP \fBMAIL_VERBOSE\fR
+.IP "\fBMAIL_VERBOSE\fR (value does not matter)"
 Enable verbose logging for debugging purposes.
-.IP \fBMAIL_DEBUG\fR
+.IP "\fBMAIL_DEBUG\fR (value does not matter)"
 Enable debugging with an external command, as specified with the
 \fBdebugger_command\fR configuration parameter.
+.IP \fBNAME\fR
+The sender full name. This is used only with messages that
+have no \fBFrom:\fR message header. See also the \fB-F\fR
+option above.
 .SH "CONFIGURATION PARAMETERS"
 .na
 .nf

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index c37d800ba583358cebb5cc6c1e82d9f6d850dc33..3c387c2bf3aced1660ed115c8549f3d54920fad2 100644 (file)
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -7044,21 +7044,21 @@ level and is the default cipherlist for the SMTP server. You are
 strongly encouraged to not change this setting.
 .PP
 This feature is available in Postfix 2.3 and later.
-.SH tls_high_cipherlist (default: !EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)
+.SH tls_high_cipherlist (default: ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)
 The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
 the meaning of the "high" setting in smtpd_tls_mandatory_ciphers,
 smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. You are
 strongly encouraged to not change this setting.
 .PP
 This feature is available in Postfix 2.3 and later.
-.SH tls_low_cipherlist (default: !EXPORT:ALL:+RC4:@STRENGTH)
+.SH tls_low_cipherlist (default: ALL:!EXPORT:+RC4:@STRENGTH)
 The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
 the meaning of the "low" setting in smtpd_tls_mandatory_ciphers,
 smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. You are
 strongly encouraged to not change this setting.
 .PP
 This feature is available in Postfix 2.3 and later.
-.SH tls_medium_cipherlist (default: !EXPORT:!LOW:ALL:+RC4:@STRENGTH)
+.SH tls_medium_cipherlist (default: ALL:!EXPORT:!LOW:+RC4:@STRENGTH)
 The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
 defines the meaning of the "medium" setting in smtpd_tls_mandatory_ciphers,
 smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. This is

diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8
index 40d18484b1aeb8acccf1504368e304e53430d881..1dd18024c1310743ae2770b0a5605caa2b0d7c82 100644 (file)
--- a/postfix/man/man8/smtp.8
+++ b/postfix/man/man8/smtp.8
@@ -347,11 +347,11 @@ The server certificate peername verification method for the
 The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
 process requests from the \fBtlsmgr\fR(8) server in order to seed its
 internal pseudo random number generator (PRNG).
-.IP "\fBtls_high_cipherlist (!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)\fR"
+.IP "\fBtls_high_cipherlist (ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "HIGH" grade ciphers.
-.IP "\fBtls_medium_cipherlist (!EXPORT:!LOW:ALL:+RC4:@STRENGTH)\fR"
+.IP "\fBtls_medium_cipherlist (ALL:!EXPORT:!LOW:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers.
-.IP "\fBtls_low_cipherlist (!EXPORT:ALL:+RC4:@STRENGTH)\fR"
+.IP "\fBtls_low_cipherlist (ALL:!EXPORT:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "LOW" or higher grade ciphers.
 .IP "\fBtls_export_cipherlist (ALL:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "EXPORT" or higher grade ciphers.

diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8
index b0865010bbbee6ec36c79f827a4695fab6d309f3..2794c906bbbf1de0c0bed8ac9a0cb71acd5567b0 100644 (file)
--- a/postfix/man/man8/smtpd.8
+++ b/postfix/man/man8/smtpd.8
@@ -378,11 +378,11 @@ instead of using the STARTTLS command.
 The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
 process requests from the \fBtlsmgr\fR(8) server in order to seed its
 internal pseudo random number generator (PRNG).
-.IP "\fBtls_high_cipherlist (!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)\fR"
+.IP "\fBtls_high_cipherlist (ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "HIGH" grade ciphers.
-.IP "\fBtls_medium_cipherlist (!EXPORT:!LOW:ALL:+RC4:@STRENGTH)\fR"
+.IP "\fBtls_medium_cipherlist (ALL:!EXPORT:!LOW:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers.
-.IP "\fBtls_low_cipherlist (!EXPORT:ALL:+RC4:@STRENGTH)\fR"
+.IP "\fBtls_low_cipherlist (ALL:!EXPORT:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "LOW" or higher grade ciphers.
 .IP "\fBtls_export_cipherlist (ALL:+RC4:@STRENGTH)\fR"
 The OpenSSL cipherlist for "EXPORT" or higher grade ciphers.

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index f031b6f571687c9207989689fd93668c03bf529f..30d07f1bd4344e984379ed9ad56ca99c73426e86 100644 (file)
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -10301,7 +10301,7 @@ works in addition to the exclusions listed with smtp_tls_exclude_ciphers
 
 <p> This feature is available in Postfix 2.3 and later. </p>
 
-%PARAM tls_high_cipherlist !EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH
+%PARAM tls_high_cipherlist ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH
 
 <p> The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
 the meaning of the "high" setting in smtpd_tls_mandatory_ciphers,
@@ -10310,7 +10310,7 @@ strongly encouraged to not change this setting. </p>
 
 <p> This feature is available in Postfix 2.3 and later. </p>
 
-%PARAM tls_medium_cipherlist !EXPORT:!LOW:ALL:+RC4:@STRENGTH
+%PARAM tls_medium_cipherlist ALL:!EXPORT:!LOW:+RC4:@STRENGTH
 
 <p> The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
 defines the meaning of the "medium" setting in smtpd_tls_mandatory_ciphers,
@@ -10322,7 +10322,7 @@ setting. </p>
 
 <p> This feature is available in Postfix 2.3 and later. </p>
 
-%PARAM tls_low_cipherlist !EXPORT:ALL:+RC4:@STRENGTH
+%PARAM tls_low_cipherlist ALL:!EXPORT:+RC4:@STRENGTH
 
 <p> The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
 the meaning of the "low" setting in smtpd_tls_mandatory_ciphers,

diff --git a/postfix/src/cleanup/Makefile.in b/postfix/src/cleanup/Makefile.in
index 34a810098e055fbab7d3e550cd439edbe1793a92..d8453891539dc58fca775c2648099204c8024639 100644 (file)
--- a/postfix/src/cleanup/Makefile.in
+++ b/postfix/src/cleanup/Makefile.in
@@ -60,7 +60,7 @@ cleanup_masquerade: cleanup_masquerade.o
 
 CLEANUP_MILTER_OBJS = cleanup_state.o cleanup_out.o cleanup_addr.o \
        cleanup_out_recipient.o 
-cleanup_milter: cleanup_milter.o $(CLEANUP_MILTER_OBJS)
+cleanup_milter: cleanup_milter.o $(CLEANUP_MILTER_OBJS) $(LIBS)
        mv cleanup_milter.o junk
        $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(CLEANUP_MILTER_OBJS) $(LIBS) $(SYSLIBS)
        mv junk cleanup_milter.o

diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index 3e63728cc0c3b760b5c98095872870c467dc12bf..a940e1ec70fc101880e6f2a32b363988a50c2439 100644 (file)
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -2648,15 +2648,15 @@ extern bool var_smtp_cname_overr;
   * TLS cipherlists
   */
 #define VAR_TLS_HIGH_CLIST     "tls_high_cipherlist"
-#define DEF_TLS_HIGH_CLIST     "!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH"
+#define DEF_TLS_HIGH_CLIST     "ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH"
 extern char *var_tls_high_clist;
 
 #define VAR_TLS_MEDIUM_CLIST   "tls_medium_cipherlist"
-#define DEF_TLS_MEDIUM_CLIST   "!EXPORT:!LOW:ALL:+RC4:@STRENGTH"
+#define DEF_TLS_MEDIUM_CLIST   "ALL:!EXPORT:!LOW:+RC4:@STRENGTH"
 extern char *var_tls_medium_clist;
 
 #define VAR_TLS_LOW_CLIST      "tls_low_cipherlist"
-#define DEF_TLS_LOW_CLIST      "!EXPORT:ALL:+RC4:@STRENGTH"
+#define DEF_TLS_LOW_CLIST      "ALL:!EXPORT:+RC4:@STRENGTH"
 extern char *var_tls_low_clist;
 
 #define VAR_TLS_EXPORT_CLIST   "tls_export_cipherlist"

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 44bb8bfd5bf3dd6f9975c87f18d03ae307247737..501d61b7e94db01d8faa3085b0485361c85b0cec 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20060825"
+#define MAIL_RELEASE_DATE      "20060903"
 #define MAIL_VERSION_NUMBER    "2.4"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/global/record.c b/postfix/src/global/record.c
index a52003e75bc26b58a651b0d54a5846f2668892d2..3ef7ca7b5c287ae22eb98eb8c6b26d37aac0f044 100644 (file)
--- a/postfix/src/global/record.c
+++ b/postfix/src/global/record.c
@@ -320,10 +320,13 @@ int     rec_goto(VSTREAM *stream, const char *buf)
        msg_warn("%s: malformed pointer record value: %s",
                 VSTREAM_PATH(stream), buf);
        return (REC_TYPE_ERROR);
-    } else if (offset < saved_offset && ++reverse_count > REVERSE_JUMP_LIMIT) {
+    } else if (offset == 0) {
+       /* Dummy record. */
+       return (0);
+    } else if (offset <= saved_offset && ++reverse_count > REVERSE_JUMP_LIMIT) {
        msg_warn("%s: too many reverse jump records", VSTREAM_PATH(stream));
        return (REC_TYPE_ERROR);
-    } else if (offset > 0 && vstream_fseek(stream, offset, SEEK_SET) < 0) {
+    } else if (vstream_fseek(stream, offset, SEEK_SET) < 0) {
        msg_warn("%s: seek error after pointer record: %m",
                 VSTREAM_PATH(stream));
        return (REC_TYPE_ERROR);

diff --git a/postfix/src/milter/milter8.c b/postfix/src/milter/milter8.c
index 4f5c4d609ebc28515748e8a1177274b0e8d6770d..2fe60af83d89a4f5e9fdb10e8b99ab9583e50de4 100644 (file)
--- a/postfix/src/milter/milter8.c
+++ b/postfix/src/milter/milter8.c
@@ -143,6 +143,12 @@
 #define SMFIR_REPLYCODE                'y'     /* reply code etc */
 #define SMFIR_QUARANTINE       'q'     /* quarantine */
 
+ /* Introduced with Sendmail 8.14. */
+#define SMFIR_ADDRCPT_PAR      '2'     /* add recipient (incl. ESMTP args) */
+#define SMFIR_CHGFROM          'e'     /* change envelope sender (from) */
+#define SMFIR_SETSYMLIST       'l'     /* set list of symbols (macros) */
+#define SMFIR_SKIP             's'     /* skip */
+
  /*
   * Commands that the filter does not want to receive, and replies that the
   * filter will not send.
@@ -154,10 +160,23 @@
 #define SMFIP_NOBODY           (1L<<4) /* MTA should not send body */
 #define SMFIP_NOHDRS           (1L<<5) /* MTA should not send headers */
 #define SMFIP_NOEOH            (1L<<6) /* MTA should not send EOH */
-#define SMFIP_NOHREPL          (1L<<7) /* filter will not reply per header */
+#define SMFIP_NR_HDR           (1L<<7) /* filter will not reply per header */
+#define SMFIP_NOHREPL          SMFIP_NR_HDR
 #define SMFIP_NOUNKNOWN        (1L<<8) /* MTA should not send unknown cmd */
 #define SMFIP_NODATA           (1L<<9) /* MTA should not send DATA */
 
+ /* Introduced with Sendmail 8.14. */
+#define SMFIP_SKIP     0x00000400L     /* MTA understands SMFIS_SKIP */
+#define SMFIP_RCPT_REJ 0x00000800L     /* MTA should send rejected RCPTs */
+#define SMFIP_NR_CONN  0x00001000L     /* No reply for connect */
+#define SMFIP_NR_HELO  0x00002000L     /* No reply for HELO */
+#define SMFIP_NR_MAIL  0x00004000L     /* No reply for MAIL */
+#define SMFIP_NR_RCPT  0x00008000L     /* No reply for RCPT */
+#define SMFIP_NR_DATA  0x00010000L     /* No reply for DATA */
+#define SMFIP_NR_UNKN  0x00020000L     /* No reply for UNKN */
+#define SMFIP_NR_EOH   0x00040000L     /* No reply for eoh */
+#define SMFIP_NR_BODY  0x00080000L     /* No reply for body chunk */
+
  /*
   * Modifications that the filter may request at the end of the message body.
   */

diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c
index f7cc4b7ae476c1550028afee16c62912958b516c..4f33a0c04b5686c5df8246f2ebbf7544de0c07e9 100644 (file)
--- a/postfix/src/sendmail/sendmail.c
+++ b/postfix/src/sendmail/sendmail.c
@@ -95,7 +95,8 @@
 /*     with the MAIL_CONFIG environment variable to override the
 /*     location of configuration files.
 /* .IP "\fB-F \fIfull_name\fR
-/*     Set the sender full name. This is used only with messages that
+/*     Set the sender full name. This overrides the NAME environment
+/*     variable, and is used only with messages that
 /*     have no \fBFrom:\fR message header.
 /* .IP "\fB-f \fIsender\fR"
 /*     Set the envelope sender address. This is the address where
@@ -227,11 +228,15 @@
 /* .fi
 /* .IP \fBMAIL_CONFIG\fR
 /*     Directory with Postfix configuration files.
-/* .IP \fBMAIL_VERBOSE\fR
+/* .IP "\fBMAIL_VERBOSE\fR (value does not matter)"
 /*     Enable verbose logging for debugging purposes.
-/* .IP \fBMAIL_DEBUG\fR
+/* .IP "\fBMAIL_DEBUG\fR (value does not matter)"
 /*     Enable debugging with an external command, as specified with the
 /*     \fBdebugger_command\fR configuration parameter.
+/* .IP \fBNAME\fR
+/*     The sender full name. This is used only with messages that
+/*     have no \fBFrom:\fR message header. See also the \fB-F\fR
+/*     option above.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi

diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c
index b6fdad8b04a3e405d5e4d3c75ee4249d775e56dc..21a7aab6b1384f371bbd592e8d847b1272e7d665 100644 (file)
--- a/postfix/src/smtp/smtp.c
+++ b/postfix/src/smtp/smtp.c
@@ -317,11 +317,11 @@
 /*     The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
 /*     process requests from the \fBtlsmgr\fR(8) server in order to seed its
 /*     internal pseudo random number generator (PRNG).
-/* .IP "\fBtls_high_cipherlist (!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)\fR"
+/* .IP "\fBtls_high_cipherlist (ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "HIGH" grade ciphers.
-/* .IP "\fBtls_medium_cipherlist (!EXPORT:!LOW:ALL:+RC4:@STRENGTH)\fR"
+/* .IP "\fBtls_medium_cipherlist (ALL:!EXPORT:!LOW:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers.
-/* .IP "\fBtls_low_cipherlist (!EXPORT:ALL:+RC4:@STRENGTH)\fR"
+/* .IP "\fBtls_low_cipherlist (ALL:!EXPORT:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "LOW" or higher grade ciphers.
 /* .IP "\fBtls_export_cipherlist (ALL:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "EXPORT" or higher grade ciphers.

diff --git a/postfix/src/smtp/smtp_connect.c b/postfix/src/smtp/smtp_connect.c
index b8fbde19f5af7237b83e7b37e4b7313de26e30ad..3f87e7dc3045ca995844e56c9967d88e5276ef28 100644 (file)
--- a/postfix/src/smtp/smtp_connect.c
+++ b/postfix/src/smtp/smtp_connect.c
@@ -663,9 +663,9 @@ static void smtp_connect_remote(SMTP_STATE *state, const char *nexthop,
      * primary destination to be a list (it could be just separators).
      */
     sites = argv_alloc(1);
-    argv_add(sites, request->nexthop, (char *) 0);
+    argv_add(sites, nexthop, (char *) 0);
     if (sites->argc == 0)
-       msg_panic("null destination: \"%s\"", request->nexthop);
+       msg_panic("null destination: \"%s\"", nexthop);
     non_fallback_sites = sites->argc;
     if ((state->misc_flags & SMTP_MISC_FLAG_USE_LMTP) == 0)
        argv_split_append(sites, var_fallback_relay, ", \t\r\n");

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 7447a2cff9ebdc947f1254ce7b7ace459b3faf1c..e186a5f8b612fbb85c51243e4b80a0e812937e96 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -346,11 +346,11 @@
 /*     The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
 /*     process requests from the \fBtlsmgr\fR(8) server in order to seed its
 /*     internal pseudo random number generator (PRNG).
-/* .IP "\fBtls_high_cipherlist (!EXPORT:!LOW:!MEDIUM:ALL:+RC4:@STRENGTH)\fR"
+/* .IP "\fBtls_high_cipherlist (ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "HIGH" grade ciphers.
-/* .IP "\fBtls_medium_cipherlist (!EXPORT:!LOW:ALL:+RC4:@STRENGTH)\fR"
+/* .IP "\fBtls_medium_cipherlist (ALL:!EXPORT:!LOW:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers.
-/* .IP "\fBtls_low_cipherlist (!EXPORT:ALL:+RC4:@STRENGTH)\fR"
+/* .IP "\fBtls_low_cipherlist (ALL:!EXPORT:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "LOW" or higher grade ciphers.
 /* .IP "\fBtls_export_cipherlist (ALL:+RC4:@STRENGTH)\fR"
 /*     The OpenSSL cipherlist for "EXPORT" or higher grade ciphers.

diff --git a/postfix/src/util/dict_cidr.c b/postfix/src/util/dict_cidr.c
index 28f075e7802189a96cbde84e42af8cacb6e72b03..6f12f9f87c6a93b213ff0ed13bdffba6e1cf4378 100644 (file)
--- a/postfix/src/util/dict_cidr.c
+++ b/postfix/src/util/dict_cidr.c
@@ -78,6 +78,8 @@ static const char *dict_cidr_lookup(DICT *dict, const char *key)
     if (msg_verbose)
        msg_info("dict_cidr_lookup: %s: %s", dict->name, key);
 
+    dict_errno = 0;
+
     if ((entry = (DICT_CIDR_ENTRY *)
         cidr_match_execute(&(dict_cidr->head->cidr_info), key)) != 0)
        return (entry->value);

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 296806d3e427758162860a8076460e21b5248c7a..11499916bf14366bd40655ece8bf6bef236dbc6c 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -28,6 +28,7 @@
     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
+    || defined(NETBSD4) \
     || defined(EKKOBSD1)
 #define SUPPORTED
 #include <sys/types.h>