-Optional lookup table with the SASL login names that own sender +Optional lookup table with the SASL login names that own the sender (MAIL FROM) addresses.
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index a059efcad..b767f2884 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -10522,7 +10522,7 @@ for authentication. The available types are listed with the .PP This feature is available in Postfix 2.3 and later. .SH smtpd_sender_login_maps (default: empty) -Optional lookup table with the SASL login names that own sender +Optional lookup table with the SASL login names that own the sender (MAIL FROM) addresses. .PP Specify zero or more "type:name" lookup tables, separated by diff --git a/postfix/proto/DATABASE_README.html b/postfix/proto/DATABASE_README.html index 0fb0a9e85..c6525ed4c 100644 --- a/postfix/proto/DATABASE_README.html +++ b/postfix/proto/DATABASE_README.html @@ -313,7 +313,7 @@ private databases are maintained by Postfix daemons. The database name as used in "hash:table" is the database file name without the ".db" suffix.-Optional lookup table with the SASL login names that own sender +Optional lookup table with the SASL login names that own the sender (MAIL FROM) addresses.
diff --git a/postfix/src/cleanup/cleanup_message.c b/postfix/src/cleanup/cleanup_message.c index d10cb395a..b945cdc11 100644 --- a/postfix/src/cleanup/cleanup_message.c +++ b/postfix/src/cleanup/cleanup_message.c @@ -390,11 +390,18 @@ static const char *cleanup_act(CLEANUP_STATE *state, char *context, msg_warn("bad PREPEND header text \"%s\" in %s map -- " "need \"headername: headervalue\"", optional_text, map_class); - } else { - VSTRING *temp; /* XXX Impedance mismatch. */ + } + + /* + * By design, cleanup_out_header() may modify content. Play safe + * and prepare for future developments. + */ + else { + VSTRING *temp; cleanup_act_log(state, "prepend", context, buf, optional_text); - temp = vstring_import(mystrdup(optional_text)); + temp = vstring_strcpy(vstring_alloc(strlen(optional_text)), + optional_text); cleanup_out_header(state, temp); vstring_free(temp); } diff --git a/postfix/src/dns/dns.h b/postfix/src/dns/dns.h index e2b8701ac..c65ac732e 100644 --- a/postfix/src/dns/dns.h +++ b/postfix/src/dns/dns.h @@ -57,7 +57,7 @@ /* * Disable DNSSEC at compile-time even if RES_USE_DNSSEC is available */ -#ifdef DISABLE_DNSSEC +#ifdef NO_DNSSEC #undef RES_USE_DNSSEC #endif diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 3d70d32dc..0a84fd808 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 "20151003" +#define MAIL_RELEASE_DATE "20151011" #define MAIL_VERSION_NUMBER "3.1" #ifdef SNAPSHOT diff --git a/postfix/src/util/dict_pcre.c b/postfix/src/util/dict_pcre.c index 57b07fd9f..fe388c2a2 100644 --- a/postfix/src/util/dict_pcre.c +++ b/postfix/src/util/dict_pcre.c @@ -223,35 +223,42 @@ static void dict_pcre_exec_error(const char *mapname, int lineno, int errval) return; case PCRE_ERROR_NULL: case PCRE_ERROR_BADOPTION: - msg_fatal("pcre map %s, line %d: bad args to re_exec", - mapname, lineno); + msg_warn("pcre map %s, line %d: bad args to re_exec", + mapname, lineno); + return; case PCRE_ERROR_BADMAGIC: case PCRE_ERROR_UNKNOWN_NODE: - msg_fatal("pcre map %s, line %d: corrupt compiled regexp", - mapname, lineno); + msg_warn("pcre map %s, line %d: corrupt compiled regexp", + mapname, lineno); + return; #ifdef PCRE_ERROR_NOMEMORY case PCRE_ERROR_NOMEMORY: - msg_fatal("pcre map %s, line %d: out of memory", - mapname, lineno); + msg_warn("pcre map %s, line %d: out of memory", + mapname, lineno); + return; #endif #ifdef PCRE_ERROR_MATCHLIMIT case PCRE_ERROR_MATCHLIMIT: - msg_fatal("pcre map %s, line %d: matched text exceeds buffer limit", - mapname, lineno); + msg_warn("pcre map %s, line %d: backtracking limit exceeded", + mapname, lineno); + return; #endif #ifdef PCRE_ERROR_BADUTF8 case PCRE_ERROR_BADUTF8: - msg_fatal("pcre map %s, line %d: bad UTF-8 sequence in search string", - mapname, lineno); + msg_warn("pcre map %s, line %d: bad UTF-8 sequence in search string", + mapname, lineno); + return; #endif #ifdef PCRE_ERROR_BADUTF8_OFFSET case PCRE_ERROR_BADUTF8_OFFSET: - msg_fatal("pcre map %s, line %d: bad UTF-8 start offset in search string", - mapname, lineno); + msg_warn("pcre map %s, line %d: bad UTF-8 start offset in search string", + mapname, lineno); + return; #endif default: - msg_fatal("pcre map %s, line %d: unknown re_exec error: %d", - mapname, lineno, errval); + msg_warn("pcre map %s, line %d: unknown re_exec error: %d", + mapname, lineno, errval); + return; } } diff --git a/postfix/src/util/vstring.c b/postfix/src/util/vstring.c index 84c92989a..acbb848f1 100644 --- a/postfix/src/util/vstring.c +++ b/postfix/src/util/vstring.c @@ -565,9 +565,14 @@ VSTRING *vstring_import(char *str) vp = (VSTRING *) mymalloc(sizeof(*vp)); len = strlen(str); + vp->vbuf.flags = 0; + vp->vbuf.len = 0; vp->vbuf.data = (unsigned char *) str; vp->vbuf.len = len + 1; VSTRING_AT_OFFSET(vp, len); + vp->vbuf.get_ready = vstring_buf_get_ready; + vp->vbuf.put_ready = vstring_buf_put_ready; + vp->vbuf.space = vstring_buf_space; vp->maxlen = 0; return (vp); }