postfix-3.5-20200126

diff --git a/postfix/HISTORY b/postfix/HISTORY
index f29d8866158e131fe79fce8185c5cb930d9229a4..ecc1701152c6422816cd096c7c4ef97ded4221ce 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24531,13 +24531,13 @@ Apologies for any names omitted.
        specified in relayhost, transport_maps, default_transport,
        and sender_dependent_default_transport_maps.  Examples:
        "relayhost = foo.example, bar.example", and "default_transport
-       = smtp:foo.exmple, bar.example". Files: smtp/smtp.c,
+       = smtp:foo.example, bar.example". Files: smtp/smtp.c,
        smtp/smtp_connect.c, trivial-rewrite/resolve.c, proto/transport,
        proto/postconf.proto, global/mail_params.c.
 
 20200112
 
-       [intially released as part of postfix-20200101-nonprod]
+       [initially released as part of postfix-20200101-nonprod]
        Refactored the haproxy infrastructure in preparation for
        haproxy version 2 support. This is necessary because version
        2 introduces a dependency of the reader on the parser.
@@ -24548,13 +24548,13 @@ Apologies for any names omitted.
        postscreen/postscreen_haproxy.c, postscreen/postscreen_haproxy.h,
        global/haproxy_srvr.h. Initial release 3.5-20200101-nonprod.
 
-       [intially released as part of postfix-20200105-nonprod]
+       [initially released as part of postfix-20200105-nonprod]
        Support for the haproxy v2 protocol. The haproxy v2 protocol
        support is limited to TCP over IPv4 and TCP over IPv6. It
        also supports non-proxied connections (typically used for
        heartbeat tests). File: global/haproxy_srvr.c.
 
-       [intially released as part of postfix-20200105-nonprod]
+       [initially released as part of postfix-20200105-nonprod]
        Cleanup: after haproxy handshake error, the Postfix SMTP
        daemon now logs the proxy connection information instead
        of unknown/unknown, and replies with "421 4.3.0 $myhostname
@@ -24564,3 +24564,13 @@ Apologies for any names omitted.
        Cleanup: miscellaneous comments, constants, error checks,
        no normal behavior change. Files: global/haproxy_srvr.c,
        postscreen/postscreen_haproxy.c.
+
+20200126
+
+       Cleanup: missing 'extern' declarations in some header files.
+       Eray Aslan. Files: global/mail_params.h, postconf/postconf.h,
+       smtpd/smtpd_expand.h, trivial-rewrite/trivial-rewrite.h
+
+       Typos: Viktor Dukhovni. File: HISTORY.
+
+       Documentation: haproxy2 support. File: proto/postconf.proto.

diff --git a/postfix/WISHLIST b/postfix/WISHLIST
index fdf23be4c633fad5a672b0dd5783990a1c958569..1732fddbe4a043614f2c3ebd1a98a067293b7daf 100644 (file)
--- a/postfix/WISHLIST
+++ b/postfix/WISHLIST
@@ -2,6 +2,8 @@ Wish list:
 
        nbbio: exercise the sanity checks with fake msg(3) functions.
 
+       optreset (bsd-ism) how badly do we need it?
+
        transport policy protocol (clone of check_policy).
 
        See also postscreen event-driven client for policy delegation

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index e75315737ff5c545861bda1f487c60afc5343c76..df102822dbc12728085387f2cb26a729a213955e 100644 (file)
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -8673,7 +8673,7 @@ for details. </p>
 proxy agent. When a proxy agent is used, this protocol conveys local
 and remote address and port information. Specify
 "<a href="postconf.5.html#postscreen_upstream_proxy_protocol">postscreen_upstream_proxy_protocol</a> = haproxy" to enable the haproxy
-protocol. <p>
+protocol; version 2 is supported with Postfix 3.5 and later. <p>
 
 <p> This feature is available in Postfix 2.10 and later.  </p>
 
@@ -17866,7 +17866,7 @@ purpose. </p>
 proxy agent. When a proxy agent is used, this protocol conveys local
 and remote address and port information.  Specify
 "<a href="postconf.5.html#smtpd_upstream_proxy_protocol">smtpd_upstream_proxy_protocol</a> = haproxy" to enable the haproxy
-protocol.  </p>
+protocol; version 2 is supported with Postfix 3.5 and later. </p>
 
 <p> NOTE: To use the nginx proxy with <a href="smtpd.8.html">smtpd(8)</a>, enable the XCLIENT
 protocol with <a href="postconf.5.html#smtpd_authorized_xclient_hosts">smtpd_authorized_xclient_hosts</a>. This supports SASL

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index 00544d338d54825f88ae97e0d8deeb362157c96f..32e0f22bbc144a3d1b4e15421ec78b32f775ec1f 100644 (file)
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -5367,7 +5367,7 @@ The name of the proxy protocol used by an optional before\-postscreen
 proxy agent. When a proxy agent is used, this protocol conveys local
 and remote address and port information. Specify
 "postscreen_upstream_proxy_protocol = haproxy" to enable the haproxy
-protocol.
+protocol; version 2 is supported with Postfix 3.5 and later.
 .PP
 This feature is available in Postfix 2.10 and later.
 .SH postscreen_upstream_proxy_timeout (default: 5s)
@@ -12475,7 +12475,7 @@ The name of the proxy protocol used by an optional before\-smtpd
 proxy agent. When a proxy agent is used, this protocol conveys local
 and remote address and port information.  Specify
 "smtpd_upstream_proxy_protocol = haproxy" to enable the haproxy
-protocol.
+protocol; version 2 is supported with Postfix 3.5 and later.
 .PP
 NOTE: To use the nginx proxy with \fBsmtpd\fR(8), enable the XCLIENT
 protocol with smtpd_authorized_xclient_hosts. This supports SASL

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 5bc0ec5a2b4a94838dde009d5cf655d3ce624476..53a72cd01aa0219686d42d604d7d7b7ae93fb0ae 100644 (file)
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -15595,7 +15595,7 @@ pattern. </p>
 proxy agent. When a proxy agent is used, this protocol conveys local
 and remote address and port information. Specify
 "postscreen_upstream_proxy_protocol = haproxy" to enable the haproxy
-protocol. <p>
+protocol; version 2 is supported with Postfix 3.5 and later. <p>
 
 <p> This feature is available in Postfix 2.10 and later.  </p>
 
@@ -15612,7 +15612,7 @@ postscreen_upstream_proxy_protocol parameter. </p>
 proxy agent. When a proxy agent is used, this protocol conveys local
 and remote address and port information.  Specify
 "smtpd_upstream_proxy_protocol = haproxy" to enable the haproxy
-protocol.  </p>
+protocol; version 2 is supported with Postfix 3.5 and later. </p>
 
 <p> NOTE: To use the nginx proxy with smtpd(8), enable the XCLIENT
 protocol with smtpd_authorized_xclient_hosts. This supports SASL

diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index 80088c5c04d6c1956a278b1fef870a46277f533c..f9576be28a25c721567d3ef9a05d7952dab4c611 100644 (file)
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -3983,23 +3983,23 @@ extern char *var_tlsp_clnt_fpt_dgst;
 
 #define VAR_TLSP_CLNT_USE_TLS          "tlsproxy_client_use_tls"
 #define DEF_TLSP_CLNT_USE_TLS          "$" VAR_SMTP_USE_TLS
-bool    var_tlsp_clnt_use_tls;
+extern bool var_tlsp_clnt_use_tls;
 
 #define VAR_TLSP_CLNT_ENFORCE_TLS      "tlsproxy_client_enforce_tls"
 #define DEF_TLSP_CLNT_ENFORCE_TLS      "$" VAR_SMTP_ENFORCE_TLS
-bool    var_tlsp_clnt_enforce_tls;
+extern bool var_tlsp_clnt_enforce_tls;
 
 #define VAR_TLSP_CLNT_LEVEL            "tlsproxy_client_level"
 #define DEF_TLSP_CLNT_LEVEL            "$" VAR_SMTP_TLS_LEVEL
-char   *var_tlsp_clnt_level;
+extern char *var_tlsp_clnt_level;
 
 #define VAR_TLSP_CLNT_PER_SITE         "tlsproxy_client_per_site"
 #define DEF_TLSP_CLNT_PER_SITE         "$" VAR_SMTP_TLS_PER_SITE
-char   *var_tlsp_clnt_per_site;
+extern char *var_tlsp_clnt_per_site;
 
 #define VAR_TLSP_CLNT_POLICY           "tlsproxy_client_policy"
 #define DEF_TLSP_CLNT_POLICY           "$" VAR_SMTP_TLS_POLICY
-char   *var_tlsp_clnt_policy;
+extern char *var_tlsp_clnt_policy;
 
  /*
   * SMTPD "reject" contact info.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index fd5e8555ff356439178df99b9665cbbfe6d924ec..7b011202ec38a1e074bd206dd6cf8bfc2dff1d42 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      "20200112"
+#define MAIL_RELEASE_DATE      "20200126"
 #define MAIL_VERSION_NUMBER    "3.5"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postconf/postconf.h b/postfix/src/postconf/postconf.h
index 0f47648755290c6660df7f9eef13750fce340692..7b23380a5793d97df4eb62a525d85266cf35911e 100644 (file)
--- a/postfix/src/postconf/postconf.h
+++ b/postfix/src/postconf/postconf.h
@@ -152,7 +152,7 @@ typedef struct {
   * Lookup table for master.cf entries. The table is terminated with an entry
   * that has a null argv member.
   */
-PCF_MASTER_ENT *pcf_master_table;
+extern PCF_MASTER_ENT *pcf_master_table;
 
  /*
   * Line-wrapping support.

diff --git a/postfix/src/smtpd/smtpd_expand.h b/postfix/src/smtpd/smtpd_expand.h
index 71d705c01bc27c2150a4405b0aee0c9148685e86..3680036a04b6b0b540fd98743bc740bf57509479 100644 (file)
--- a/postfix/src/smtpd/smtpd_expand.h
+++ b/postfix/src/smtpd/smtpd_expand.h
@@ -18,7 +18,7 @@
  /*
   * External interface.
   */
-VSTRING *smtpd_expand_filter;
+extern VSTRING *smtpd_expand_filter;
 void    smtpd_expand_init(void);
 const char *smtpd_expand_lookup(const char *, int, void *);
 int     smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int);

diff --git a/postfix/src/trivial-rewrite/trivial-rewrite.h b/postfix/src/trivial-rewrite/trivial-rewrite.h
index bf0dd4a088889d1272f6d232e7f41cdeaaf989a1..42016efb08f0c1710e429c1c32063486475a443a 100644 (file)
--- a/postfix/src/trivial-rewrite/trivial-rewrite.h
+++ b/postfix/src/trivial-rewrite/trivial-rewrite.h
@@ -23,7 +23,7 @@
  /*
   * Connection management.
   */
-int     server_flags;
+extern int server_flags;
 
  /*
   * rewrite.c