mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-28 20:57:56 +00:00
Code Issues Releases Wiki Activity

postfix-3.5-20200126

Browse Source
This commit is contained in:
Wietse Venema 2020-01-26 00:00:00 -05:00 committed by Viktor Dukhovni
parent e1b52f45e3
commit d40744a7c8
10 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
postfix/HISTORY
View File

@ -24531,13 +24531,13 @@ Apologies for any names omitted.
specified in relayhost, transport_maps, default_transport, specified in relayhost, transport_maps, default_transport,
and sender_dependent_default_transport_maps. Examples: and sender_dependent_default_transport_maps. Examples:
"relayhost = foo.example, bar.example", and "default_transport "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, smtp/smtp_connect.c, trivial-rewrite/resolve.c, proto/transport,
proto/postconf.proto, global/mail_params.c. proto/postconf.proto, global/mail_params.c.
20200112 20200112
[intially released as part of postfix-20200101-nonprod] [initially released as part of postfix-20200101-nonprod]
Refactored the haproxy infrastructure in preparation for Refactored the haproxy infrastructure in preparation for
haproxy version 2 support. This is necessary because version haproxy version 2 support. This is necessary because version
2 introduces a dependency of the reader on the parser. 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, postscreen/postscreen_haproxy.c, postscreen/postscreen_haproxy.h,
global/haproxy_srvr.h. Initial release 3.5-20200101-nonprod. 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 for the haproxy v2 protocol. The haproxy v2 protocol
support is limited to TCP over IPv4 and TCP over IPv6. It support is limited to TCP over IPv4 and TCP over IPv6. It
also supports non-proxied connections (typically used for also supports non-proxied connections (typically used for
heartbeat tests). File: global/haproxy_srvr.c. 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 Cleanup: after haproxy handshake error, the Postfix SMTP
daemon now logs the proxy connection information instead daemon now logs the proxy connection information instead
of unknown/unknown, and replies with "421 4.3.0 $myhostname 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, Cleanup: miscellaneous comments, constants, error checks,
no normal behavior change. Files: global/haproxy_srvr.c, no normal behavior change. Files: global/haproxy_srvr.c,
postscreen/postscreen_haproxy.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.

2
postfix/WISHLIST
View File

@ -2,6 +2,8 @@ Wish list:
nbbio: exercise the sanity checks with fake msg(3) functions. 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). transport policy protocol (clone of check_policy).
See also postscreen event-driven client for policy delegation See also postscreen event-driven client for policy delegation

4
postfix/html/postconf.5.html
View File

@ -8673,7 +8673,7 @@ for details. </p>
proxy agent. When a proxy agent is used, this protocol conveys local proxy agent. When a proxy agent is used, this protocol conveys local
and remote address and port information. Specify 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 "<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> <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 proxy agent. When a proxy agent is used, this protocol conveys local
and remote address and port information. Specify 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 "<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 <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 protocol with <a href="postconf.5.html#smtpd_authorized_xclient_hosts">smtpd_authorized_xclient_hosts</a>. This supports SASL

4
postfix/man/man5/postconf.5
View File

@ -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 proxy agent. When a proxy agent is used, this protocol conveys local
and remote address and port information. Specify and remote address and port information. Specify
"postscreen_upstream_proxy_protocol = haproxy" to enable the haproxy "postscreen_upstream_proxy_protocol = haproxy" to enable the haproxy
protocol. protocol; version 2 is supported with Postfix 3.5 and later.
.PP .PP
This feature is available in Postfix 2.10 and later. This feature is available in Postfix 2.10 and later.
.SH postscreen_upstream_proxy_timeout (default: 5s) .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 proxy agent. When a proxy agent is used, this protocol conveys local
and remote address and port information. Specify and remote address and port information. Specify
"smtpd_upstream_proxy_protocol = haproxy" to enable the haproxy "smtpd_upstream_proxy_protocol = haproxy" to enable the haproxy
protocol. protocol; version 2 is supported with Postfix 3.5 and later.
.PP .PP
NOTE: To use the nginx proxy with \fBsmtpd\fR(8), enable the XCLIENT NOTE: To use the nginx proxy with \fBsmtpd\fR(8), enable the XCLIENT
protocol with smtpd_authorized_xclient_hosts. This supports SASL protocol with smtpd_authorized_xclient_hosts. This supports SASL

4
postfix/proto/postconf.proto
View File

@ -15595,7 +15595,7 @@ pattern. </p>
proxy agent. When a proxy agent is used, this protocol conveys local proxy agent. When a proxy agent is used, this protocol conveys local
and remote address and port information. Specify and remote address and port information. Specify
"postscreen_upstream_proxy_protocol = haproxy" to enable the haproxy "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> <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 proxy agent. When a proxy agent is used, this protocol conveys local
and remote address and port information. Specify and remote address and port information. Specify
"smtpd_upstream_proxy_protocol = haproxy" to enable the haproxy "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 <p> NOTE: To use the nginx proxy with smtpd(8), enable the XCLIENT
protocol with smtpd_authorized_xclient_hosts. This supports SASL protocol with smtpd_authorized_xclient_hosts. This supports SASL

10
postfix/src/global/mail_params.h
View File

@ -3983,23 +3983,23 @@ extern char *var_tlsp_clnt_fpt_dgst;
#define VAR_TLSP_CLNT_USE_TLS "tlsproxy_client_use_tls" #define VAR_TLSP_CLNT_USE_TLS "tlsproxy_client_use_tls"
#define DEF_TLSP_CLNT_USE_TLS "$" VAR_SMTP_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 VAR_TLSP_CLNT_ENFORCE_TLS "tlsproxy_client_enforce_tls"
#define DEF_TLSP_CLNT_ENFORCE_TLS "$" VAR_SMTP_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 VAR_TLSP_CLNT_LEVEL "tlsproxy_client_level"
#define DEF_TLSP_CLNT_LEVEL "$" VAR_SMTP_TLS_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 VAR_TLSP_CLNT_PER_SITE "tlsproxy_client_per_site"
#define DEF_TLSP_CLNT_PER_SITE "$" VAR_SMTP_TLS_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 VAR_TLSP_CLNT_POLICY "tlsproxy_client_policy"
#define DEF_TLSP_CLNT_POLICY "$" VAR_SMTP_TLS_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. * SMTPD "reject" contact info.

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20200112" #define MAIL_RELEASE_DATE "20200126"
#define MAIL_VERSION_NUMBER "3.5" #define MAIL_VERSION_NUMBER "3.5"
#ifdef SNAPSHOT #ifdef SNAPSHOT

2
postfix/src/postconf/postconf.h
View File

@ -152,7 +152,7 @@ typedef struct {
* Lookup table for master.cf entries. The table is terminated with an entry * Lookup table for master.cf entries. The table is terminated with an entry
* that has a null argv member. * that has a null argv member.
*/ */
PCF_MASTER_ENT *pcf_master_table; extern PCF_MASTER_ENT *pcf_master_table;
/* /*
* Line-wrapping support. * Line-wrapping support.

2
postfix/src/smtpd/smtpd_expand.h
View File

@ -18,7 +18,7 @@
/* /*
* External interface. * External interface.
*/ */
VSTRING *smtpd_expand_filter; extern VSTRING *smtpd_expand_filter;
void smtpd_expand_init(void); void smtpd_expand_init(void);
const char *smtpd_expand_lookup(const char *, int, void *); const char *smtpd_expand_lookup(const char *, int, void *);
int smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int); int smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int);

2
postfix/src/trivial-rewrite/trivial-rewrite.h
View File

@ -23,7 +23,7 @@
/* /*
* Connection management. * Connection management.
*/ */
int server_flags; extern int server_flags;
/* /*
* rewrite.c * rewrite.c