mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-22 18:07:41 +00:00
Code Issues Releases Wiki Activity

postfix-2.10-20121022

Browse Source
This commit is contained in:
Wietse Venema 2012-10-22 00:00:00 -05:00 committed by Viktor Dukhovni
parent d067f766c1
commit e58ca957c8
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postfix/HISTORY
View File

@ -18058,3 +18058,9 @@ Apologies for any names omitted.
Documentation: why "smtp_address_preference = any" is the Documentation: why "smtp_address_preference = any" is the
preferred setting. File: proto/postconf.proto. 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.

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20121019" #define MAIL_RELEASE_DATE "20121022"
#define MAIL_VERSION_NUMBER "2.10" #define MAIL_VERSION_NUMBER "2.10"
#ifdef SNAPSHOT #ifdef SNAPSHOT

3
postfix/src/postmap/postmap.c
View File

@ -890,7 +890,8 @@ int main(int argc, char **argv)
if ((query == 0 || strcmp(query, "-") != 0) if ((query == 0 || strcmp(query, "-") != 0)
&& (postmap_flags & POSTMAP_FLAG_ANY_KEY)) && (postmap_flags & POSTMAP_FLAG_ANY_KEY))
msg_fatal("specify -b -h or -m only with \"-q -\""); 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)) == (postmap_flags & POSTMAP_FLAG_MIME_KEY))
msg_warn("ignoring -m option without -b or -h"); msg_warn("ignoring -m option without -b or -h");