postfix-2.10-20121022

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 9a523a5cd33c8bbdd4e217b63581424df5af9748..ca858d60abde3749ed3ba8186cca7cbab69ea79e 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -18058,3 +18058,9 @@ Apologies for any names omitted.
 
        Documentation: why "smtp_address_preference = any" is the
        preferred setting. File: proto/postconf.proto.
+
+20121022
+
+       Bugfix (introduced 20101009) don't complain abuot stray -m
+       option if none of -[bhm] is specified. Ralf Hildebrandt.
+       File: postmap/postmap.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 35a690494f4d175454e8f425e4d0de22ec9c01b5..15bd13c880441f20261a7d9a0f42b0a33cc206ec 100644 (file)
--- 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      "20121019"
+#define MAIL_RELEASE_DATE      "20121022"
 #define MAIL_VERSION_NUMBER    "2.10"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postmap/postmap.c b/postfix/src/postmap/postmap.c
index 29cedbcf09e0f1b8217dca563a654468338323e0..b3a545b87ee3f67250c6e2b55d61c737256ede56 100644 (file)
--- a/postfix/src/postmap/postmap.c
+++ b/postfix/src/postmap/postmap.c
@@ -890,7 +890,8 @@ int     main(int argc, char **argv)
     if ((query == 0 || strcmp(query, "-") != 0)
        && (postmap_flags & POSTMAP_FLAG_ANY_KEY))
        msg_fatal("specify -b -h or -m only with \"-q -\"");
-    if ((postmap_flags & POSTMAP_FLAG_ANY_KEY)
+    if ((postmap_flags & POSTMAP_FLAG_ANY_KEY) != 0
+       && (postmap_flags & POSTMAP_FLAG_ANY_KEY)
        == (postmap_flags & POSTMAP_FLAG_MIME_KEY))
        msg_warn("ignoring -m option without -b or -h");