mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-09-03 07:35:20 +00:00
Code Issues Releases Wiki Activity

postfix-3.3-20170506

Browse Source
This commit is contained in:
Wietse Venema
2017-05-06 00:00:00 -05:00
committed by Viktor Dukhovni
parent 16de2a99fd
commit a5aa2ebfc5
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
postfix/HISTORY
View File

@@ -22980,3 +22980,7 @@ Apologies for any names omitted.
Files: smtp/smtp.c, smtp/smtp_params.c, smtp/smtp_addr.c, Files: smtp/smtp.c, smtp/smtp_params.c, smtp/smtp_addr.c,
global/mail_params.h, proto/postconf.proto. global/mail_params.h, proto/postconf.proto.
20170506
A last-minute cosmetic fix had introduced a bug in
smtp/smtp_addr.c.

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 "20170505" #define MAIL_RELEASE_DATE "20170506"
#define MAIL_VERSION_NUMBER "3.3" #define MAIL_VERSION_NUMBER "3.3"
#ifdef SNAPSHOT #ifdef SNAPSHOT

15
postfix/src/smtp/smtp_addr.c
View File

@@ -361,11 +361,12 @@ static DNS_RR *smtp_balance_inet_proto(DNS_RR *addr_list, int misc_flags,
{ {
const char myname[] = "smtp_balance_inet_proto"; const char myname[] = "smtp_balance_inet_proto";
DNS_RR *rr; DNS_RR *rr;
DNS_RR *result_list; DNS_RR *stripped_list;
DNS_RR *next; DNS_RR *next;
int v6_count; int v6_count;
int v4_count; int v4_count;
int v6_target, v4_target; int v6_target,
v4_target;
int *p; int *p;
/* /*
@@ -439,7 +440,7 @@ static DNS_RR *smtp_balance_inet_proto(DNS_RR *addr_list, int misc_flags,
msg_info("v6_target=%d, v4_target=%d", v6_target, v4_target); msg_info("v6_target=%d, v4_target=%d", v6_target, v4_target);
/* Enforce the address count targets. */ /* Enforce the address count targets. */
result_list = 0; stripped_list = 0;
for (rr = addr_list; rr != 0; rr = next) { for (rr = addr_list; rr != 0; rr = next) {
next = rr->next; next = rr->next;
rr->next = 0; rr->next = 0;
@@ -452,7 +453,7 @@ static DNS_RR *smtp_balance_inet_proto(DNS_RR *addr_list, int misc_flags,
myname, dns_strtype(rr->type)); myname, dns_strtype(rr->type));
} }
if (*p > 0) { if (*p > 0) {
result_list = dns_rr_append(result_list, rr); stripped_list = dns_rr_append(stripped_list, rr);
*p -= 1; *p -= 1;
} else { } else {
dns_rr_free(rr); dns_rr_free(rr);
@@ -462,9 +463,11 @@ static DNS_RR *smtp_balance_inet_proto(DNS_RR *addr_list, int misc_flags,
msg_panic("%s: bad target count: v4_target=%d, v6_target=%d", msg_panic("%s: bad target count: v4_target=%d, v6_target=%d",
myname, v4_target, v6_target); myname, v4_target, v6_target);
if (msg_verbose) if (msg_verbose)
smtp_print_addr("smtp_balance_inet_proto result", result_list); smtp_print_addr("smtp_balance_inet_proto result", stripped_list);
return (stripped_list);
} else {
return (addr_list);
} }
return (result_list);
} }
/* smtp_domain_addr - mail exchanger address lookup */ /* smtp_domain_addr - mail exchanger address lookup */