[src/trunk]: src/external/ibm-public/postfix/dist Resolve conflicts caused by...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0474894f71bb
branches:  trunk
changeset: 754028:0474894f71bb
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Apr 17 10:29:17 2010 +0000

description:
Resolve conflicts caused by import of Postfix 2.6.6.

diffstat:

 external/ibm-public/postfix/dist/html/postconf.5.html     |   8 +++++---
 external/ibm-public/postfix/dist/man/man5/postconf.5      |   8 ++++++--
 external/ibm-public/postfix/dist/proto/postconf.proto     |   8 +++++---
 external/ibm-public/postfix/dist/src/global/mail_params.h |   4 ++--
 external/ibm-public/postfix/dist/src/smtpd/smtpd.c        |  10 +++++-----
 5 files changed, 23 insertions(+), 15 deletions(-)

diffs (122 lines):

diff -r 95458ac95f7e -r 0474894f71bb external/ibm-public/postfix/dist/html/postconf.5.html
--- a/external/ibm-public/postfix/dist/html/postconf.5.html     Sat Apr 17 10:23:40 2010 +0000
+++ b/external/ibm-public/postfix/dist/html/postconf.5.html     Sat Apr 17 10:29:17 2010 +0000
@@ -256,9 +256,11 @@
 of an address verification request in progress.
 </p>
 
-<p>
-The default poll count is 3.
-</p>
+<p> By default, the Postfix SMTP server polls the <a href="verify.8.html">verify(8)</a> service
+up to three times under non-overload conditions, and only once when
+under overload.  With Postfix version 2.5 and earlier, the SMTP
+server always polls the <a href="verify.8.html">verify(8)</a> service up to three times by
+default.  </p>
 
 <p>
 Specify 1 to implement a crude form of greylisting, that is, always
diff -r 95458ac95f7e -r 0474894f71bb external/ibm-public/postfix/dist/man/man5/postconf.5
--- a/external/ibm-public/postfix/dist/man/man5/postconf.5      Sat Apr 17 10:23:40 2010 +0000
+++ b/external/ibm-public/postfix/dist/man/man5/postconf.5      Sat Apr 17 10:29:17 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: postconf.5,v 1.3 2009/08/31 17:57:09 tron Exp $
+.\"    $NetBSD: postconf.5,v 1.4 2010/04/17 10:29:18 tron Exp $
 .\"
 .TH POSTCONF 5 
 .SH NAME
@@ -144,7 +144,11 @@
 How many times to query the \fBverify\fR(8) service for the completion
 of an address verification request in progress.
 .PP
-The default poll count is 3.
+By default, the Postfix SMTP server polls the \fBverify\fR(8) service
+up to three times under non-overload conditions, and only once when
+under overload.  With Postfix version 2.5 and earlier, the SMTP
+server always polls the \fBverify\fR(8) service up to three times by
+default.
 .PP
 Specify 1 to implement a crude form of greylisting, that is, always
 defer the first delivery request for a never seen before address.
diff -r 95458ac95f7e -r 0474894f71bb external/ibm-public/postfix/dist/proto/postconf.proto
--- a/external/ibm-public/postfix/dist/proto/postconf.proto     Sat Apr 17 10:23:40 2010 +0000
+++ b/external/ibm-public/postfix/dist/proto/postconf.proto     Sat Apr 17 10:29:17 2010 +0000
@@ -287,9 +287,11 @@
 of an address verification request in progress.
 </p>
 
-<p>
-The default poll count is 3.
-</p>
+<p> By default, the Postfix SMTP server polls the verify(8) service
+up to three times under non-overload conditions, and only once when
+under overload.  With Postfix version 2.5 and earlier, the SMTP
+server always polls the verify(8) service up to three times by
+default.  </p>
 
 <p>
 Specify 1 to implement a crude form of greylisting, that is, always
diff -r 95458ac95f7e -r 0474894f71bb external/ibm-public/postfix/dist/src/global/mail_params.h
--- a/external/ibm-public/postfix/dist/src/global/mail_params.h Sat Apr 17 10:23:40 2010 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_params.h Sat Apr 17 10:29:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mail_params.h,v 1.2 2009/06/23 11:41:06 tron Exp $     */
+/*     $NetBSD: mail_params.h,v 1.3 2010/04/17 10:29:18 tron Exp $     */
 
 #ifndef _MAIL_PARAMS_H_INCLUDED_
 #define _MAIL_PARAMS_H_INCLUDED_
@@ -2554,7 +2554,7 @@
 extern char *var_verify_sender;
 
 #define VAR_VERIFY_POLL_COUNT          "address_verify_poll_count"
-#define DEF_VERIFY_POLL_COUNT          3
+#define DEF_VERIFY_POLL_COUNT          "${stress?1}${stress:3}"
 extern int var_verify_poll_count;
 
 #define VAR_VERIFY_POLL_DELAY          "address_verify_poll_delay"
diff -r 95458ac95f7e -r 0474894f71bb external/ibm-public/postfix/dist/src/smtpd/smtpd.c
--- a/external/ibm-public/postfix/dist/src/smtpd/smtpd.c        Sat Apr 17 10:23:40 2010 +0000
+++ b/external/ibm-public/postfix/dist/src/smtpd/smtpd.c        Sat Apr 17 10:29:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smtpd.c,v 1.2 2009/06/23 11:41:06 tron Exp $   */
+/*     $NetBSD: smtpd.c,v 1.3 2010/04/17 10:29:18 tron Exp $   */
 
 /*++
 /* NAME
@@ -3207,9 +3207,9 @@
        smtpd_chat_reply(state, "501 5.1.3 Bad recipient address syntax");
        return (-1);
     }
-    /* Not: state->addr_buf */
+    /* Use state->addr_buf, with the unquoted result from extract_addr() */
     if (SMTPD_STAND_ALONE(state) == 0
-       && (err = smtpd_check_rcpt(state, argv[1].strval)) != 0) {
+       && (err = smtpd_check_rcpt(state, STR(state->addr_buf))) != 0) {
        smtpd_chat_reply(state, "%s", err);
        return (-1);
     }
@@ -4466,7 +4466,7 @@
                    && (err = milter_unknown_event(smtpd_milters,
                                                   argv[0].strval)) != 0
                    && (err = check_milter_reply(state, err)) != 0) {
-                   smtpd_chat_reply(state, err);
+                   smtpd_chat_reply(state, "%s", err);
                } else
                    smtpd_chat_reply(state, "502 5.5.2 Error: command not recognized");
                state->error_mask |= MAIL_ERROR_PROTOCOL;
@@ -4903,6 +4903,7 @@
        VAR_SMTPD_SOFT_ERLIM, DEF_SMTPD_SOFT_ERLIM, &var_smtpd_soft_erlim, 1, 0,
        VAR_SMTPD_HARD_ERLIM, DEF_SMTPD_HARD_ERLIM, &var_smtpd_hard_erlim, 1, 0,
        VAR_SMTPD_JUNK_CMD, DEF_SMTPD_JUNK_CMD, &var_smtpd_junk_cmd_limit, 1, 0,
+       VAR_VERIFY_POLL_COUNT, DEF_VERIFY_POLL_COUNT, &var_verify_poll_count, 1, 0,
        0,
     };
     static const CONFIG_INT_TABLE int_table[] = {
@@ -4931,7 +4932,6 @@
        VAR_VIRT_MAILBOX_CODE, DEF_VIRT_MAILBOX_CODE, &var_virt_mailbox_code, 0, 0,
        VAR_RELAY_RCPT_CODE, DEF_RELAY_RCPT_CODE, &var_relay_rcpt_code, 0, 0,
        VAR_PLAINTEXT_CODE, DEF_PLAINTEXT_CODE, &var_plaintext_code, 0, 0,
-       VAR_VERIFY_POLL_COUNT, DEF_VERIFY_POLL_COUNT, &var_verify_poll_count, 1, 0,
        VAR_SMTPD_CRATE_LIMIT, DEF_SMTPD_CRATE_LIMIT, &var_smtpd_crate_limit, 0, 0,
        VAR_SMTPD_CCONN_LIMIT, DEF_SMTPD_CCONN_LIMIT, &var_smtpd_cconn_limit, 0, 0,
        VAR_SMTPD_CMAIL_LIMIT, DEF_SMTPD_CMAIL_LIMIT, &var_smtpd_cmail_limit, 0, 0,