mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-30 13:48:06 +00:00
Code Issues Releases Wiki Activity

postfix-2.5-20071227

Browse Source
This commit is contained in:
Wietse Venema
2007-12-27 00:00:00 -05:00
committed by Viktor Dukhovni
parent 54a1b6ce1f
commit 3abc0372e2
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
postfix/HISTORY
View File

@@ -14060,7 +14060,7 @@ Apologies for any names omitted.
Milter can now update its own macros instead of clobbering Milter can now update its own macros instead of clobbering
the global copy that is shared with other Milters. Also an the global copy that is shared with other Milters. Also an
opportunity to clean up some ad-hoc code for sending macro opportunity to clean up some ad-hoc code for sending macro
lists from smtp(8) to cleanup(8). Files: milter/milter.c, lists from smtpd(8) to cleanup(8). Files: milter/milter.c,
milter/milter8.c, milter/milter_macros.c. milter/milter8.c, milter/milter_macros.c.
20071224 20071224
@@ -14070,4 +14070,10 @@ Apologies for any names omitted.
milter/milter.c, milter/milter8.c, milter/milter_macros.c. milter/milter.c, milter/milter8.c, milter/milter_macros.c.
Cleanup: name_code(3) and name_mask(3) now support read-only Cleanup: name_code(3) and name_mask(3) now support read-only
tables. Files: util/name_code.[hc] util/name_mask.[hc]. tables. Files: util/name_code.[hc], util/name_mask.[hc].
20071227
Cleanup: further refinements of the Milter code, allowing
for multiple macro overrides. The code is now ready for
serious testing. File: milter/milter8.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 "20071224" #define MAIL_RELEASE_DATE "20071227"
#define MAIL_VERSION_NUMBER "2.5" #define MAIL_VERSION_NUMBER "2.5"
#ifdef SNAPSHOT #ifdef SNAPSHOT

15
postfix/src/milter/milter8.c
View File

@@ -319,7 +319,7 @@ static const NAME_CODE smfim_table[] = {
/* /*
* Mapping from external macro set numbers to our internal MILTER_MACROS * Mapping from external macro set numbers to our internal MILTER_MACROS
* structure members, without using an array or switch statement. * structure members, without using a switch statement.
*/ */
static const size_t milter8_macro_offsets[] = { static const size_t milter8_macro_offsets[] = {
offsetof(MILTER_MACROS, conn_macros), /* SMFIM_CONNECT */ offsetof(MILTER_MACROS, conn_macros), /* SMFIM_CONNECT */
@@ -1740,7 +1740,7 @@ static void milter8_connect(MILTER8 *milter)
&& milter8_read_data(milter, &data_len, && milter8_read_data(milter, &data_len,
MILTER8_DATA_HLONG, &mac_type, MILTER8_DATA_HLONG, &mac_type,
MILTER8_DATA_STRING, buf, MILTER8_DATA_STRING, buf,
MILTER8_DATA_END) == 0) { MILTER8_DATA_MORE) == 0) {
smfim_name = str_name_code(smfim_table, mac_type); smfim_name = str_name_code(smfim_table, mac_type);
if (smfim_name == 0) { if (smfim_name == 0) {
msg_warn("milter %s: ignoring unknown macro type %u", msg_warn("milter %s: ignoring unknown macro type %u",
@@ -2599,13 +2599,12 @@ MILTER *milter8_receive(VSTREAM *stream, MILTERS *parent)
#endif #endif
} else if ((fd = LOCAL_RECV_FD(vstream_fileno(stream))) < 0) { } else if ((fd = LOCAL_RECV_FD(vstream_fileno(stream))) < 0) {
FREE_MACROS_AND_RETURN(0); FREE_MACROS_AND_RETURN(0);
#ifdef MUST_READ_AFTER_SENDING_FD
} else if (attr_print(stream, ATTR_FLAG_NONE,
ATTR_TYPE_STR, MAIL_ATTR_DUMMY, "",
ATTR_TYPE_END) != 0) {
FREE_MACROS_AND_RETURN(0);
#endif
} else { } else {
#ifdef MUST_READ_AFTER_SENDING_FD
(void) attr_print(stream, ATTR_FLAG_NONE,
ATTR_TYPE_STR, MAIL_ATTR_DUMMY, "",
ATTR_TYPE_END);
#endif
#define NO_PROTOCOL ((char *) 0) #define NO_PROTOCOL ((char *) 0)
if (msg_verbose) if (msg_verbose)