postfix-3.3-20170506

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 51f1b08eeed1cf4ea0be9f55d93b31f161df85a2..49060fe561c136dd5d9d0599320a8ceada177ec4 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -22980,3 +22980,7 @@ Apologies for any names omitted.
        Files: smtp/smtp.c, smtp/smtp_params.c, smtp/smtp_addr.c,
        global/mail_params.h, proto/postconf.proto.
 
+20170506
+
+       A last-minute cosmetic fix had introduced a bug in
+       smtp/smtp_addr.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 9ab7a1874bd490de5f5625c39a7077f8585c30fc..34bd7c2e143a49c5cf05befcf5456d18781397f0 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      "20170505"
+#define MAIL_RELEASE_DATE      "20170506"
 #define MAIL_VERSION_NUMBER    "3.3"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtp/smtp_addr.c b/postfix/src/smtp/smtp_addr.c
index 46652a5e6179928f3134cfc89dad7a5c4c968189..5fb51b56fb020a0f525fd063f7ecbd9cf55c0fb6 100644 (file)
--- a/postfix/src/smtp/smtp_addr.c
+++ b/postfix/src/smtp/smtp_addr.c
@@ -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";
     DNS_RR *rr;
-    DNS_RR *result_list;
+    DNS_RR *stripped_list;
     DNS_RR *next;
     int     v6_count;
     int     v4_count;
-    int     v6_target, v4_target;
+    int     v6_target,
+            v4_target;
     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);
 
        /* Enforce the address count targets. */
-       result_list = 0;
+       stripped_list = 0;
        for (rr = addr_list; rr != 0; rr = next) {
            next = rr->next;
            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));
            }
            if (*p > 0) {
-               result_list = dns_rr_append(result_list, rr);
+               stripped_list = dns_rr_append(stripped_list, rr);
                *p -= 1;
            } else {
                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",
                      myname, v4_target, v6_target);
        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 */