Prereq: "3.5.13" diff -ur --new-file /var/tmp/postfix-3.5.13/src/global/mail_version.h ./src/global/mail_version.h --- /var/tmp/postfix-3.5.13/src/global/mail_version.h 2021-11-07 17:35:31.000000000 -0500 +++ ./src/global/mail_version.h 2022-01-14 17:56:36.000000000 -0500 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20211107" -#define MAIL_VERSION_NUMBER "3.5.13" +#define MAIL_RELEASE_DATE "20220114" +#define MAIL_VERSION_NUMBER "3.5.14" #ifdef SNAPSHOT #define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -ur --new-file /var/tmp/postfix-3.5.13/HISTORY ./HISTORY --- /var/tmp/postfix-3.5.13/HISTORY 2021-11-07 18:09:38.000000000 -0500 +++ ./HISTORY 2022-01-14 16:47:33.000000000 -0500 @@ -25055,3 +25055,34 @@ previously occupied by the original message body. Problem report by Benoît Panizzon. + +20211115 + + Bugfix (introduced: 20210708): duplicate bounce_notice_recipient + entries in postconf output. The fix to send SMTP session + transcripts to bounce_notice_recipient was incomplete. + Reported by Vincent Lefevre. File: smtpd/smtpd.c. + +20211216 + + Bugfix (introduced: Postfix 3.0): the proxymap daemon did + not automatically authorize proxied maps inside pipemap + (example: pipemap:{proxy:maptype:mapname, ...}) or inside + unionmap. Problem reported by Mirko Vogt. Files: + proxymap/proxymap.c. + +20211220 + + Bugfix (introduced: Postfix 2.5): off-by-one error while + writing a string terminator. This code had passed all memory + corruption tests, presumably because it wrote over an + alignment padding byte, or over an adjacent character byte + that was never read. Reported by Robert Siemer. Files: + *qmgr/qmgr_feedback.c. + +20211223 + + Cleanup: added missing _maps parameter names to the + proxy_read_maps default value, based on output from the + mantools/missing-proxy-read-maps script. File: + global/mail_params.h. diff -ur --new-file /var/tmp/postfix-3.5.13/src/global/mail_params.h ./src/global/mail_params.h --- /var/tmp/postfix-3.5.13/src/global/mail_params.h 2021-01-17 08:11:47.000000000 -0500 +++ ./src/global/mail_params.h 2022-01-11 19:46:53.000000000 -0500 @@ -2442,7 +2442,10 @@ " $" VAR_SMTPD_EHLO_DIS_MAPS \ " $" VAR_SMTPD_MILTER_MAPS \ " $" VAR_VIRT_GID_MAPS \ - " $" VAR_VIRT_UID_MAPS + " $" VAR_VIRT_UID_MAPS \ + " $" VAR_PSC_REJ_FTR_MAPS \ + " $" VAR_SMTPD_REJ_FTR_MAPS \ + " $" VAR_TLS_SERVER_SNI_MAPS extern char *var_proxy_read_maps; #define VAR_PROXY_WRITE_MAPS "proxy_write_maps" diff -ur --new-file /var/tmp/postfix-3.5.13/src/oqmgr/qmgr_feedback.c ./src/oqmgr/qmgr_feedback.c --- /var/tmp/postfix-3.5.13/src/oqmgr/qmgr_feedback.c 2008-01-08 15:51:39.000000000 -0500 +++ ./src/oqmgr/qmgr_feedback.c 2021-12-22 17:49:37.000000000 -0500 @@ -109,7 +109,7 @@ double enum_val; char denom_str[30 + 1]; double denom_val; - char slash; + char slash[1 + 1]; char junk; char *fbck_name; char *fbck_val; @@ -135,7 +135,7 @@ fb->base = -1; /* assume error */ switch (sscanf(fbck_val, "%lf %1[/] %30s%c", - &enum_val, &slash, denom_str, &junk)) { + &enum_val, slash, denom_str, &junk)) { case 1: fb->index = QMGR_FEEDBACK_IDX_NONE; fb->base = enum_val; diff -ur --new-file /var/tmp/postfix-3.5.13/src/proxymap/proxymap.c ./src/proxymap/proxymap.c --- /var/tmp/postfix-3.5.13/src/proxymap/proxymap.c 2019-07-24 17:19:00.000000000 -0400 +++ ./src/proxymap/proxymap.c 2021-12-23 17:38:10.000000000 -0500 @@ -232,6 +232,8 @@ #include #include #include +#include +#include /* Global library. */ @@ -296,6 +298,27 @@ #define STR(x) vstring_str(x) #define VSTREQ(x,y) (strcmp(STR(x),y) == 0) +/* get_nested_dict_name - return nested dictionary name pointer, or null */ + +static char *get_nested_dict_name(char *type_name) +{ + const struct { + const char *type_col; + ssize_t type_col_len; + } *prefix, prefixes[] = { + DICT_TYPE_UNION ":", (sizeof(DICT_TYPE_UNION ":") - 1), + DICT_TYPE_PIPE ":", (sizeof(DICT_TYPE_PIPE ":") - 1), + }; + +#define COUNT_OF(x) (sizeof(x)/sizeof((x)[0])) + + for (prefix = prefixes; prefix < prefixes + COUNT_OF(prefixes); prefix++) { + if (strncmp(type_name, prefix->type_col, prefix->type_col_len) == 0) + return (type_name + prefix->type_col_len); + } + return (0); +} + /* proxy_map_find - look up or open table */ static DICT *proxy_map_find(const char *map_type_name, int request_flags, @@ -661,41 +684,17 @@ return (dict_open(map, open_flags, dict_flags)); } -/* post_jail_init - initialization after privilege drop */ +/* authorize_proxied_maps - recursively authorize maps */ -static void post_jail_init(char *service_name, char **unused_argv) +static void authorize_proxied_maps(char *bp) { const char *sep = CHARS_COMMA_SP; const char *parens = CHARS_BRACE; - char *saved_filter; - char *bp; char *type_name; - /* - * Are we proxy writer? - */ - if (strcmp(service_name, MAIL_SERVICE_PROXYWRITE) == 0) - proxy_writer = 1; - else if (strcmp(service_name, MAIL_SERVICE_PROXYMAP) != 0) - msg_fatal("service name must be one of %s or %s", - MAIL_SERVICE_PROXYMAP, MAIL_SERVICE_PROXYMAP); - - /* - * Pre-allocate buffers. - */ - request = vstring_alloc(10); - request_map = vstring_alloc(10); - request_key = vstring_alloc(10); - request_value = vstring_alloc(10); - map_type_name_flags = vstring_alloc(10); - - /* - * Prepare the pre-approved list of proxied tables. - */ - saved_filter = bp = mystrdup(proxy_writer ? var_proxy_write_maps : - var_proxy_read_maps); - proxy_auth_maps = htable_create(13); while ((type_name = mystrtokq(&bp, sep, parens)) != 0) { + char *nested_info; + /* Maybe { maptype:mapname attr=value... } */ if (*type_name == parens[0]) { char *err; @@ -711,6 +710,22 @@ if ((type_name = mystrtokq(&type_name, sep, parens)) == 0) continue; } + /* Recurse into nested map (pipemap, unionmap). */ + if ((nested_info = get_nested_dict_name(type_name)) != 0) { + char *err; + + if (*nested_info != parens[0]) + continue; + /* Warn about blatant syntax error. */ + if ((err = extpar(&nested_info, parens, EXTPAR_FLAG_NONE)) != 0) { + msg_warn("bad %s parameter value: %s", + PROXY_MAP_PARAM_NAME(proxy_writer), err); + myfree(err); + continue; + } + authorize_proxied_maps(nested_info); + continue; + } if (strncmp(type_name, PROXY_COLON, PROXY_COLON_LEN)) continue; do { @@ -724,6 +739,39 @@ PROXY_MAP_PARAM_NAME(proxy_writer)); } } +} + +/* post_jail_init - initialization after privilege drop */ + +static void post_jail_init(char *service_name, char **unused_argv) +{ + char *saved_filter; + + /* + * Are we proxy writer? + */ + if (strcmp(service_name, MAIL_SERVICE_PROXYWRITE) == 0) + proxy_writer = 1; + else if (strcmp(service_name, MAIL_SERVICE_PROXYMAP) != 0) + msg_fatal("service name must be one of %s or %s", + MAIL_SERVICE_PROXYMAP, MAIL_SERVICE_PROXYMAP); + + /* + * Pre-allocate buffers. + */ + request = vstring_alloc(10); + request_map = vstring_alloc(10); + request_key = vstring_alloc(10); + request_value = vstring_alloc(10); + map_type_name_flags = vstring_alloc(10); + + /* + * Prepare the pre-approved list of proxied tables. + */ + saved_filter = mystrdup(proxy_writer ? var_proxy_write_maps : + var_proxy_read_maps); + proxy_auth_maps = htable_create(13); + authorize_proxied_maps(saved_filter); myfree(saved_filter); /* diff -ur --new-file /var/tmp/postfix-3.5.13/src/qmgr/qmgr_feedback.c ./src/qmgr/qmgr_feedback.c --- /var/tmp/postfix-3.5.13/src/qmgr/qmgr_feedback.c 2008-01-08 15:51:44.000000000 -0500 +++ ./src/qmgr/qmgr_feedback.c 2021-12-22 17:49:37.000000000 -0500 @@ -109,7 +109,7 @@ double enum_val; char denom_str[30 + 1]; double denom_val; - char slash; + char slash[1 + 1]; char junk; char *fbck_name; char *fbck_val; @@ -135,7 +135,7 @@ fb->base = -1; /* assume error */ switch (sscanf(fbck_val, "%lf %1[/] %30s%c", - &enum_val, &slash, denom_str, &junk)) { + &enum_val, slash, denom_str, &junk)) { case 1: fb->index = QMGR_FEEDBACK_IDX_NONE; fb->base = enum_val; diff -ur --new-file /var/tmp/postfix-3.5.13/src/smtpd/smtpd.c ./src/smtpd/smtpd.c --- /var/tmp/postfix-3.5.13/src/smtpd/smtpd.c 2021-07-24 18:20:43.000000000 -0400 +++ ./src/smtpd/smtpd.c 2021-11-15 08:42:43.000000000 -0500 @@ -6419,7 +6419,7 @@ VAR_EOD_CHECKS, DEF_EOD_CHECKS, &var_eod_checks, 0, 0, VAR_MAPS_RBL_DOMAINS, DEF_MAPS_RBL_DOMAINS, &var_maps_rbl_domains, 0, 0, VAR_RBL_REPLY_MAPS, DEF_RBL_REPLY_MAPS, &var_rbl_reply_maps, 0, 0, - VAR_BOUNCE_RCPT, DEF_ERROR_RCPT, &var_bounce_rcpt, 1, 0, + VAR_BOUNCE_RCPT, DEF_BOUNCE_RCPT, &var_bounce_rcpt, 1, 0, VAR_ERROR_RCPT, DEF_ERROR_RCPT, &var_error_rcpt, 1, 0, VAR_REST_CLASSES, DEF_REST_CLASSES, &var_rest_classes, 0, 0, VAR_CANONICAL_MAPS, DEF_CANONICAL_MAPS, &var_canonical_maps, 0, 0,