From: Wietse Venema <wietse@porcupine.org>
Date: Mon, 22 Oct 2012 05:00:00 +0000 (-0500)
Subject: postfix-2.10-20121022
X-Git-Tag: v2.10.0-RC1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e58ca957c8f3a54cdb8beabb11259bc80d53df89;p=thirdparty%2Fpostfix.git

postfix-2.10-20121022
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 9a523a5cd..ca858d60a 100644
--- 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 35a690494..15bd13c88 100644
--- 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 29cedbcf0..b3a545b87 100644
--- 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");