| | -DNO_DEVPOLL | Do not build with
Solaris /dev/poll support. By default, /dev/poll
support is compiled in on Solaris versions that are known to support
diff -cr --new-file /var/tmp/postfix-3.0.2/src/cleanup/cleanup_message.c ./src/cleanup/cleanup_message.c
*** /var/tmp/postfix-3.0.2/src/cleanup/cleanup_message.c 2014-12-06 20:35:33.000000000 -0500
--- ./src/cleanup/cleanup_message.c 2015-10-04 18:29:37.000000000 -0400
***************
*** 385,395 ****
if (STREQUAL(value, "PREPEND", command_len)) {
if (*optional_text == 0) {
msg_warn("PREPEND action without text in %s map", map_class);
! } else if (strcmp(context, CLEANUP_ACT_CTXT_HEADER) == 0
! && !is_header(optional_text)) {
! msg_warn("bad PREPEND header text \"%s\" in %s map -- "
! "need \"headername: headervalue\"",
! optional_text, map_class);
} else {
cleanup_act_log(state, "prepend", context, buf, optional_text);
cleanup_out_string(state, REC_TYPE_NORM, optional_text);
--- 385,404 ----
if (STREQUAL(value, "PREPEND", command_len)) {
if (*optional_text == 0) {
msg_warn("PREPEND action without text in %s map", map_class);
! } else if (strcmp(context, CLEANUP_ACT_CTXT_HEADER) == 0) {
! if (!is_header(optional_text)) {
! msg_warn("bad PREPEND header text \"%s\" in %s map -- "
! "need \"headername: headervalue\"",
! optional_text, map_class);
! } else {
! VSTRING *temp;
!
! cleanup_act_log(state, "prepend", context, buf, optional_text);
! temp = vstring_strcpy(vstring_alloc(strlen(optional_text)),
! optional_text);
! cleanup_out_header(state, temp);
! vstring_free(temp);
! }
} else {
cleanup_act_log(state, "prepend", context, buf, optional_text);
cleanup_out_string(state, REC_TYPE_NORM, optional_text);
diff -cr --new-file /var/tmp/postfix-3.0.2/src/dns/dns.h ./src/dns/dns.h
*** /var/tmp/postfix-3.0.2/src/dns/dns.h 2014-12-02 17:44:03.000000000 -0500
--- ./src/dns/dns.h 2015-10-10 09:44:53.000000000 -0400
***************
*** 54,59 ****
--- 54,66 ----
#endif
+ /*
+ * Disable DNSSEC at compile-time even if RES_USE_DNSSEC is available
+ */
+ #ifdef NO_DNSSEC
+ #undef RES_USE_DNSSEC
+ #endif
+
/*
* Compatibility with systems that lack RES_USE_DNSSEC and RES_USE_EDNS0
*/
diff -cr --new-file /var/tmp/postfix-3.0.2/src/dns/dns_lookup.c ./src/dns/dns_lookup.c
*** /var/tmp/postfix-3.0.2/src/dns/dns_lookup.c 2014-12-06 20:35:33.000000000 -0500
--- ./src/dns/dns_lookup.c 2015-10-03 17:01:51.000000000 -0400
***************
*** 790,795 ****
--- 790,796 ----
int hpref_status = INT_MIN;
VSTRING *hpref_rtext = 0;
int hpref_rcode;
+ int hpref_h_errno;
DNS_RR *rr;
/* Save intermediate highest-priority result. */
***************
*** 801,806 ****
--- 802,808 ----
vstring_strcpy(hpref_rtext ? hpref_rtext : \
(hpref_rtext = vstring_alloc(VSTRING_LEN(why))), \
vstring_str(why)); \
+ hpref_h_errno = h_errno; \
} while (0)
/* Restore intermediate highest-priority result. */
***************
*** 810,815 ****
--- 812,818 ----
*rcode = hpref_rcode; \
if (why && status != DNS_OK) \
vstring_strcpy(why, vstring_str(hpref_rtext)); \
+ SET_H_ERRNO(hpref_h_errno); \
} while (0)
if (rrlist)
***************
*** 862,867 ****
--- 865,871 ----
int hpref_status = INT_MIN;
VSTRING *hpref_rtext = 0;
int hpref_rcode;
+ int hpref_h_errno;
DNS_RR *rr;
if (rrlist)
diff -cr --new-file /var/tmp/postfix-3.0.2/src/global/uxtext.c ./src/global/uxtext.c
*** /var/tmp/postfix-3.0.2/src/global/uxtext.c 2014-12-13 17:49:36.000000000 -0500
--- ./src/global/uxtext.c 2015-10-03 19:35:09.000000000 -0400
***************
*** 214,221 ****
VSTRING *uxtext_unquote(VSTRING *unquoted, const char *quoted)
{
VSTRING_RESET(unquoted);
! uxtext_unquote_append(unquoted, quoted);
! return (unquoted);
}
#ifdef TEST
--- 214,220 ----
VSTRING *uxtext_unquote(VSTRING *unquoted, const char *quoted)
{
VSTRING_RESET(unquoted);
! return (uxtext_unquote_append(unquoted, quoted) ? unquoted : 0);
}
#ifdef TEST
diff -cr --new-file /var/tmp/postfix-3.0.2/src/global/xtext.c ./src/global/xtext.c
*** /var/tmp/postfix-3.0.2/src/global/xtext.c 2014-07-17 09:00:44.000000000 -0400
--- ./src/global/xtext.c 2015-10-03 19:35:21.000000000 -0400
***************
*** 134,141 ****
VSTRING *xtext_unquote(VSTRING *unquoted, const char *quoted)
{
VSTRING_RESET(unquoted);
! xtext_unquote_append(unquoted, quoted);
! return (unquoted);
}
#ifdef TEST
--- 134,140 ----
VSTRING *xtext_unquote(VSTRING *unquoted, const char *quoted)
{
VSTRING_RESET(unquoted);
! return (xtext_unquote_append(unquoted, quoted) ? unquoted : 0);
}
#ifdef TEST
diff -cr --new-file /var/tmp/postfix-3.0.2/src/postmulti/postmulti.c ./src/postmulti/postmulti.c
*** /var/tmp/postfix-3.0.2/src/postmulti/postmulti.c 2015-02-08 12:38:30.000000000 -0500
--- ./src/postmulti/postmulti.c 2015-09-24 19:24:12.000000000 -0400
***************
*** 1711,1717 ****
case 'e':
if ((code = EDIT_CMD_CODE(optarg)) < 0)
msg_fatal("Invalid '-e' edit action '%s'. Specify '%s', "
! "'%s', '%s', '%s', '%s', '%s', '%s', '%s' or '%s'",
optarg,
EDIT_CMD_STR(EDIT_CMD_CREATE),
EDIT_CMD_STR(EDIT_CMD_DESTROY),
--- 1711,1717 ----
case 'e':
if ((code = EDIT_CMD_CODE(optarg)) < 0)
msg_fatal("Invalid '-e' edit action '%s'. Specify '%s', "
! "'%s', '%s', '%s', '%s', '%s', '%s' or '%s'",
optarg,
EDIT_CMD_STR(EDIT_CMD_CREATE),
EDIT_CMD_STR(EDIT_CMD_DESTROY),
***************
*** 1720,1727 ****
EDIT_CMD_STR(EDIT_CMD_ENABLE),
EDIT_CMD_STR(EDIT_CMD_DISABLE),
EDIT_CMD_STR(EDIT_CMD_ASSIGN),
! EDIT_CMD_STR(EDIT_CMD_INIT),
! optarg);
if (cmd_mode != code)
command_mode_count++;
cmd_mode = code;
--- 1720,1726 ----
EDIT_CMD_STR(EDIT_CMD_ENABLE),
EDIT_CMD_STR(EDIT_CMD_DISABLE),
EDIT_CMD_STR(EDIT_CMD_ASSIGN),
! EDIT_CMD_STR(EDIT_CMD_INIT));
if (cmd_mode != code)
command_mode_count++;
cmd_mode = code;
diff -cr --new-file /var/tmp/postfix-3.0.2/src/smtpd/smtpd_haproxy.c ./src/smtpd/smtpd_haproxy.c
*** /var/tmp/postfix-3.0.2/src/smtpd/smtpd_haproxy.c 2012-06-30 17:12:00.000000000 -0400
--- ./src/smtpd/smtpd_haproxy.c 2015-10-03 19:36:38.000000000 -0400
***************
*** 96,101 ****
--- 96,109 ----
VSTRING *escape_buf;
/*
+ * While reading HAProxy handshake information, don't buffer input beyond
+ * the end-of-line. That would break the TLS wrappermode handshake.
+ */
+ vstream_control(state->client,
+ VSTREAM_CTL_BUFSIZE, 1,
+ VSTREAM_CTL_END);
+
+ /*
* Note: the haproxy_srvr_parse() routine performs address protocol
* checks, address and port syntax checks, and converts IPv4-in-IPv6
* address string syntax (:ffff::1.2.3.4) to IPv4 syntax where permitted
***************
*** 142,147 ****
--- 150,162 ----
* Avoid surprises in the Dovecot authentication server.
*/
state->dest_addr = mystrdup(smtp_server_addr.buf);
+
+ /*
+ * Enable normal buffering.
+ */
+ vstream_control(state->client,
+ VSTREAM_CTL_BUFSIZE, VSTREAM_BUFSIZE,
+ VSTREAM_CTL_END);
return (0);
}
}
diff -cr --new-file /var/tmp/postfix-3.0.2/src/util/scan_dir.c ./src/util/scan_dir.c
*** /var/tmp/postfix-3.0.2/src/util/scan_dir.c 2014-12-06 20:35:33.000000000 -0500
--- ./src/util/scan_dir.c 2015-04-22 20:43:34.000000000 -0400
***************
*** 78,83 ****
--- 78,84 ----
#endif
#endif
#include
+ #include
/* Utility library. */
***************
*** 177,182 ****
--- 178,190 ----
#define STREQ(x,y) (strcmp((x),(y)) == 0)
if (info) {
+
+ /*
+ * Fix 20150421: readdir() does not reset errno after reaching the
+ * end-of-directory. This dates back all the way to the initial
+ * implementation of 19970309.
+ */
+ errno = 0;
while ((dp = readdir(info->dir)) != 0) {
if (STREQ(dp->d_name, ".") || STREQ(dp->d_name, "..")) {
if (msg_verbose > 1)
|