postfix-1.1.12-20021202

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 239401f753dd486e84233b6ebeb4a64b90651cbf..74789f4c01924823514f84464879b5b728189756 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -7251,6 +7251,16 @@ Apologies for any names omitted.
        SMTP clients. Files: smtp/smtp_connect.c, lmtp/lmtp_connect.c,
        util/host_port.[hc].
 
+20021201
+
+       Compatibility: ignore the new Sendmail -A option. File:
+       sendmail/sendmail.c.
+
+       Workaround: sendmail -v now produces no output. You need
+       to specify -v -v instead. This is to avoid problems when
+       people request verbose mail delivery in their mail.rc file.
+       File:  sendmail/sendmail.c.
+
 Open problems:
 
        Low: revise other local delivery agent duplicate filters.

diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html
index 0644b175b8a8a88132a68757e4988f9924cf35bf..1eb206f72a227b622deff5807bc537129cccdd78 100644 (file)
--- a/postfix/html/sendmail.1.html
+++ b/postfix/html/sendmail.1.html
@@ -57,6 +57,13 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        The following options are recognized:
 
+       <b>-Am</b> (ignored)
+
+       <b>-Ac</b> (ignored)
+              Postfix  sendmail  uses the same configuration file
+              regardless of whether or not a message is  an  ini-
+              tial sumbission.
+
        <b>-B</b> <i>body_type</i>
               The message body MIME type: <b>7BIT</b> or <b>8BITMIME</b>.
 
@@ -202,7 +209,9 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        <b>-v</b>     Enable verbose logging for debugging purposes. Mul-
               tiple  <b>-v</b>  options  make  the software increasingly
-              verbose.
+              verbose. For compatibility  with  mailx  and  other
+              mail  submission  software, a single <b>-v</b> option pro-
+              duces no output.
 
 <b>SECURITY</b>
        By design, this program is not  set-user  (or  group)  id.

diff --git a/postfix/man/man1/sendmail.1 b/postfix/man/man1/sendmail.1
index 6294b3f0b0e81f954cf896af6079ecb57f05af0a..94dffaf4e7306328ac47e80d4dff6089a724e6bd 100644 (file)
--- a/postfix/man/man1/sendmail.1
+++ b/postfix/man/man1/sendmail.1
@@ -55,6 +55,10 @@ appropriate combination of command-line options. Some features are
 controlled by parameters in the \fBmain.cf\fR configuration file.
 
 The following options are recognized:
+.IP "\fB-Am\fR (ignored)"
+.IP "\fB-Ac\fR (ignored)"
+Postfix sendmail uses the same configuration file regardless of
+whether or not a message is an initial sumbission.
 .IP "\fB-B \fIbody_type\fR"
 The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
 .IP "\fB-C \fIconfig_file\fR (ignored :-)"
@@ -171,7 +175,9 @@ Extract recipients from message headers. This requires that no
 recipients be specified on the command line.
 .IP \fB-v\fR
 Enable verbose logging for debugging purposes. Multiple \fB-v\fR
-options make the software increasingly verbose.
+options make the software increasingly verbose. For compatibility
+with mailx and other mail submission software, a single \fB-v\fR
+option produces no output.
 .SH SECURITY
 .na
 .nf

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 5da134b90a6cdd7ffea226633cf07299a9765b88..b036aa869f8325890da73c0eadeedaa0c534ed8c 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE      "20021130"
+#define MAIL_RELEASE_DATE      "20021202"
 
 #define VAR_MAIL_VERSION       "mail_version"
 #define DEF_MAIL_VERSION       "1.1.12-" MAIL_RELEASE_DATE

diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c
index 4682d13057bba497c167d555b3e4ba0ac7b40fd6..e3a67d974b8dc277c3d097c3ff0e96e0308ce680 100644 (file)
--- a/postfix/src/sendmail/sendmail.c
+++ b/postfix/src/sendmail/sendmail.c
@@ -49,6 +49,10 @@
 /*     controlled by parameters in the \fBmain.cf\fR configuration file.
 /*
 /*     The following options are recognized:
+/* .IP "\fB-Am\fR (ignored)"
+/* .IP "\fB-Ac\fR (ignored)"
+/*     Postfix sendmail uses the same configuration file regardless of
+/*     whether or not a message is an initial sumbission.
 /* .IP "\fB-B \fIbody_type\fR"
 /*     The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
 /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
@@ -165,7 +169,9 @@
 /*     recipients be specified on the command line.
 /* .IP \fB-v\fR
 /*     Enable verbose logging for debugging purposes. Multiple \fB-v\fR
-/*     options make the software increasingly verbose.
+/*     options make the software increasingly verbose. For compatibility
+/*     with mailx and other mail submission software, a single \fB-v\fR
+/*     option produces no output.
 /* SECURITY
 /* .ad
 /* .fi
@@ -656,7 +662,7 @@ int     main(int argc, char **argv)
            optind++;
            continue;
        }
-       if ((c = GETOPT(argc, argv, "B:C:F:GIL:N:R:UV:X:b:ce:f:h:imno:p:r:q:tvx")) <= 0)
+       if ((c = GETOPT(argc, argv, "A:B:C:F:GIL:N:R:UV:X:b:ce:f:h:imno:p:r:q:tvx")) <= 0)
            break;
        switch (c) {
        default:
@@ -767,6 +773,13 @@ int     main(int argc, char **argv)
        }
     }
 
+    /*
+     * Workaround: produce no output when verbose delivery is requested in
+     * mail.rc.
+     */
+    if (msg_verbose > 0)
+       msg_verbose--;
+
     /*
      * Look for conflicting options and arguments.
      */