From 49e676c661379cbb6235fc63fcc21aec3cf369d8 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Sun, 23 Jul 2023 00:00:00 -0500 Subject: [PATCH] postfix-3.9-20230723 --- postfix/HISTORY | 14 ++++++++++++-- postfix/WISHLIST | 5 +++++ postfix/html/postconf.5.html | 2 +- postfix/man/man5/postconf.5 | 2 +- postfix/proto/postconf.proto | 2 +- postfix/proto/stop | 1 - postfix/proto/stop.double-history | 1 + postfix/src/global/mail_params.c | 12 ++++++++---- postfix/src/global/mail_version.h | 2 +- 9 files changed, 30 insertions(+), 11 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index afc96d768..b00b396fe 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -27141,8 +27141,8 @@ Apologies for any names omitted. Cleanup: simplified the master code to handle an empty inet_interfaces setting. it is now closer to the original - code. Also documented what *_inet_addr_list() functions can - return an empty list. Files: master/master_ent.c, + code. Also documented that wildcard_inet_addr_list() will + not return an empty list. Files: master/master_ent.c, global/own_inet_addr_list.c. 20230507 @@ -27264,3 +27264,13 @@ Apologies for any names omitted. (default: yes) to disconnect remote SMTP clients that violate RFC 2920 (or 5321) command pipelining constraints. Files: global/mail_params.h, smtpd/smtpd.c, proto/postconf.proto. + +20230610 + + Trouble shooting: when the postfix UID or postdrop GID is + also used by a non-Postfix account, log the UID or GID. + File: global/mail_params.c. + +20240703 + + Typo fix by Trent W. Buck. Files: proto/postconf.proto, proto/stop. diff --git a/postfix/WISHLIST b/postfix/WISHLIST index 8d3bf6bee..6fd70dce9 100644 --- a/postfix/WISHLIST +++ b/postfix/WISHLIST @@ -6,6 +6,11 @@ Wish list: Disable -DSNAPSHOT and -DNONPROD in makedefs. + Deprecate permit_mx_backup. It is fundamentally incompatible + with recipient address validation. There is no way to fix that: + reject_unverified_recipient requires that the domain is reachable, + and in that case, permit_mx_backup is not needed. + Scan Postfix code with github.com/googleprojectzero/weggli (depends on "rust"). diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index eb23a25a0..4b6368272 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -16935,7 +16935,7 @@ The same restrictions are available as documented under smtpd_recipient_restrictions.

-

This feature is available in Postix 2.10 and later.

+

This feature is available in Postfix 2.10 and later.

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 6d47fd547..a93f67192 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -11732,7 +11732,7 @@ Continue long lines by starting the next line with whitespace. The same restrictions are available as documented under smtpd_recipient_restrictions. .PP -This feature is available in Postix 2.10 and later. +This feature is available in Postfix 2.10 and later. .SH smtpd_restriction_classes (default: empty) User\-defined aliases for groups of access restrictions. The aliases can be specified in smtpd_recipient_restrictions etc., and on the diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index a4419c03a..348ca6831 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -6447,7 +6447,7 @@ The same restrictions are available as documented under smtpd_recipient_restrictions.

-

This feature is available in Postix 2.10 and later.

+

This feature is available in Postfix 2.10 and later.

%CLASS sasl-auth SASL Authentication diff --git a/postfix/proto/stop b/postfix/proto/stop index 238698457..72cecf446 100644 --- a/postfix/proto/stop +++ b/postfix/proto/stop @@ -1182,7 +1182,6 @@ Nexthop OP OTIFY OpenSSL's -Postix Pt SECG SSLEAY diff --git a/postfix/proto/stop.double-history b/postfix/proto/stop.double-history index 0c2442677..bfa589c3d 100644 --- a/postfix/proto/stop.double-history +++ b/postfix/proto/stop.double-history @@ -58,3 +58,4 @@ proto proto aliases proto virtual proto ADDRESS_REWRITING_README html pipelining before the server greeting File smtpd smtpd c before the server greeting File smtpd smtpd c global mail_params h smtpd smtpd c proto postconf proto + Typo fix by Trent W Buck Files proto postconf proto proto stop diff --git a/postfix/src/global/mail_params.c b/postfix/src/global/mail_params.c index 1763fd383..2a7f84c2c 100644 --- a/postfix/src/global/mail_params.c +++ b/postfix/src/global/mail_params.c @@ -518,9 +518,11 @@ static void check_mail_owner(void) */ if ((pwd = getpwuid(var_owner_uid)) != 0 && strcmp(pwd->pw_name, var_mail_owner) != 0) - msg_fatal("file %s/%s: parameter %s: user %s has same user ID as %s", + msg_fatal("file %s/%s: parameter %s: user %s has the same" + " user ID %ld as user %s", var_config_dir, MAIN_CONF_FILE, - VAR_MAIL_OWNER, var_mail_owner, pwd->pw_name); + VAR_MAIL_OWNER, var_mail_owner, + (long) var_owner_uid, pwd->pw_name); } /* check_sgid_group - lookup setgid group attributes and validate */ @@ -545,9 +547,11 @@ static void check_sgid_group(void) */ if ((grp = getgrgid(var_sgid_gid)) != 0 && strcmp(grp->gr_name, var_sgid_group) != 0) - msg_fatal("file %s/%s: parameter %s: group %s has same group ID as %s", + msg_fatal("file %s/%s: parameter %s: group %s has the same" + " group ID %ld as group %s", var_config_dir, MAIN_CONF_FILE, - VAR_SGID_GROUP, var_sgid_group, grp->gr_name); + VAR_SGID_GROUP, var_sgid_group, + (long) var_sgid_gid, grp->gr_name); } /* check_overlap - disallow UID or GID sharing */ diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 0e47acfaa..25c36229f 100644 --- 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 "20230605" +#define MAIL_RELEASE_DATE "20230723" #define MAIL_VERSION_NUMBER "3.9" #ifdef SNAPSHOT -- 2.47.3