Use "strict_rfc821_envelopes = no" to accept "RCPT TO:<User
-Name <user@example.com>>". Postfix will ignore the "User
-Name" part and deliver to the <user@example.com> address.
+Name <user@example.com>>". Postfix will ignore the "User
+Name" part and deliver to the <user@example.com> address.
@@ -13929,7 +13929,7 @@ Postfix logfile records for a failed SMTP session. The text itself
is not logged to the Postfix SMTP server's maillog file.
Be sure to keep the text as short as possible. Long text may
-be truncated before it is logged in the Postfix SMTP server's maillog
+be truncated before it is logged to the remote SMTP client's maillog
file, or before it is returned to the sender in a delivery status
notification.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 67860cb9e..8b73cef61 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20110118"
-#define MAIL_VERSION_NUMBER "2.8.0-RC3"
+#define MAIL_RELEASE_DATE "20110120"
+#define MAIL_VERSION_NUMBER "2.8.0"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff --git a/postfix/src/postscreen/postscreen.c b/postfix/src/postscreen/postscreen.c
index 8df426924..7b3332b61 100644
--- a/postfix/src/postscreen/postscreen.c
+++ b/postfix/src/postscreen/postscreen.c
@@ -416,7 +416,7 @@ int var_psc_post_queue_limit;
int var_psc_pre_queue_limit;
int var_psc_watchdog;
-#define MIGRATION_WARNING
+#undef MIGRATION_WARNING
#ifdef MIGRATION_WARNING
char *var_psc_wlist_nets;
diff --git a/postfix/src/postscreen/postscreen_dict.c b/postfix/src/postscreen/postscreen_dict.c
index ce7efd056..131ff8164 100644
--- a/postfix/src/postscreen/postscreen_dict.c
+++ b/postfix/src/postscreen/postscreen_dict.c
@@ -68,23 +68,15 @@
#include
-/* psc_average - moving average */
-
-static double psc_average(double new, double old)
-{
- return (0.1 * new + 0.9 * old);
-}
-
/*
* Monitor time-critical operations.
*
* XXX Averaging support was added during a stable release candidate, so it
* provides only the absolute minimum necessary. A complete implementation
* should maintain separate statistics for each table, and it should not
- * complain when the average time between table access is larger than the
- * average table access latency.
+ * complain when the access latency is less than the time between accesses.
*/
-#define PSC_GET_TIME_BEFORE_LOOKUP \
+#define PSC_GET_TIME_BEFORE_LOOKUP { \
struct timeval _before, _after; \
DELTA_TIME _delta; \
double _new_delta_ms; \
@@ -92,6 +84,8 @@ static double psc_average(double new, double old)
#define PSC_DELTA_MS(d) ((d).dt_sec * 1000.0 + (d).dt_usec / 1000.0)
+#define PSC_AVERAGE(new, old) (0.1 * (new) + 0.9 * (old))
+
#ifndef PSC_THRESHOLD_MS
#define PSC_THRESHOLD_MS 100 /* nag if latency > 100ms */
#endif
@@ -100,18 +94,23 @@ static double psc_average(double new, double old)
#define PSC_WARN_LOCKOUT_S 60 /* don't nag for 60s */
#endif
+ /*
+ * Shared warning lock, so that we don't spam the logfile when the system
+ * becomes slow.
+ */
static time_t psc_last_warn = 0;
#define PSC_CHECK_TIME_AFTER_LOOKUP(table, action, average) \
GETTIMEOFDAY(&_after); \
PSC_CALC_DELTA(_delta, _after, _before); \
_new_delta_ms = PSC_DELTA_MS(_delta); \
- if ((average = psc_average(_new_delta_ms, average)) > PSC_THRESHOLD_MS \
- && psc_last_warn < event_time() - PSC_WARN_LOCKOUT_S) { \
+ if ((average = PSC_AVERAGE(_new_delta_ms, average)) > PSC_THRESHOLD_MS \
+ && psc_last_warn < _after.tv_sec - PSC_WARN_LOCKOUT_S) { \
msg_warn("%s: %s %s average delay is %.0f ms", \
myname, (table), (action), average); \
- psc_last_warn = event_time(); \
- }
+ psc_last_warn = _after.tv_sec; \
+ } \
+}
/* psc_addr_match_list_match - time-critical address list lookup */
diff --git a/postfix/src/postscreen/postscreen_smtpd.c b/postfix/src/postscreen/postscreen_smtpd.c
index 8e9ec6885..f42855c53 100644
--- a/postfix/src/postscreen/postscreen_smtpd.c
+++ b/postfix/src/postscreen/postscreen_smtpd.c
@@ -728,6 +728,10 @@ static void psc_smtpd_read_event(int event, char *context)
* Drain all input in the VSTREAM buffer, otherwise this socket will not
* receive further read event notification until the client disconnects!
*
+ * To suspend this loop temporarily before the buffer is drained, use the
+ * PSC_SUSPEND_SMTP_CMD_EVENTS() and PSC_RESUME_SMTP_CMD_EVENTS() macros,
+ * and set the PSC_SMTPD_CMD_FLAG_SUSPEND flag in the command table.
+ *
* Don't try to read input before it has arrived, otherwise we would starve
* the pseudo threads of other sessions. Get out of here as soon as the
* VSTREAM read buffer dries up. Do not look for more input in kernel
@@ -737,8 +741,9 @@ static void psc_smtpd_read_event(int event, char *context)
*/
/*
- * Note: on entry into this function the VSTREAM buffer may be non-empty,
- * so we test the "no more input" condition at the bottom of the loops.
+ * Note: on entry into this function the VSTREAM buffer may or may not be
+ * empty, so we test the "no more input" condition at the bottom of the
+ * loops.
*/
for (;;) {