Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/postfix Postfix 2.1.5
details: https://anonhg.NetBSD.org/src/rev/32006cf216e2
branches: trunk
changeset: 571177:32006cf216e2
user: heas <heas%NetBSD.org@localhost>
date: Sat Nov 13 05:05:16 2004 +0000
description:
Postfix 2.1.5
diffstat:
gnu/dist/postfix/HISTORY | 46 ++++++++++++++++++++++++
gnu/dist/postfix/conf/header_checks | 2 +-
gnu/dist/postfix/examples/smtpd-policy/spf.pl | 2 +-
gnu/dist/postfix/html/header_checks.5.html | 2 +-
gnu/dist/postfix/html/postconf.5.html | 14 +++----
gnu/dist/postfix/man/man5/header_checks.5 | 4 +-
gnu/dist/postfix/proto/header_checks | 2 +-
gnu/dist/postfix/proto/postconf.proto | 14 +++----
gnu/dist/postfix/src/bounce/bounce_notify_util.c | 6 +--
gnu/dist/postfix/src/global/mail_version.h | 6 +-
gnu/dist/postfix/src/smtp/smtp_chat.c | 10 ++++-
gnu/dist/postfix/src/spawn/spawn.c | 6 ++-
gnu/dist/postfix/src/util/spawn_command.c | 16 +++++--
gnu/dist/postfix/src/util/vstream_popen.c | 4 +-
14 files changed, 97 insertions(+), 37 deletions(-)
diffs (truncated from 351 to 300 lines):
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/HISTORY
--- a/gnu/dist/postfix/HISTORY Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/HISTORY Sat Nov 13 05:05:16 2004 +0000
@@ -9406,3 +9406,49 @@
recipient delimiter if one is defined, so that extended
addresses don't get extra delivery concurrency slots.
Files: *qmgr/qmgr_message.c.
+
+20040714
+
+ Bugfix: the code to eliminate the local MTA from the MX
+ address list did not handle the case that inet_interfaces
+ produced a less preferred match than proxy_interfaces.
+ Victor Duchovni, Morgan Stanley. File: smtp/smtp_addr.c.
+
+20040723
+
+ Safety: spawn(8) now rejects a user with the -1 UID or GID
+ value, so that commands will not end up running as root.
+ Files: util/spawn_command.c, spawn/spawn.c.
+
+ Bugfix: "421 Timeout exceeded" wasn't guarded by setjmp().
+ Victor Duchovni, Morgan Stanley. File: smtpd/smtpd.c.
+
+20040801
+
+ Portability: h_errno is not an lvalue in the UnixWare 7.1
+ multi-threaded environment. Olivier PRENANT.
+
+20040812
+
+ Bugfix: update SMTP server error counter when a client is
+ denied access with smtpd_delay_reject=no.
+
+20040817
+
+ Bugfix: The smtp_chat_cmd() output flushing code in the
+ SMTP client could run before an I/O error handler was set
+ up. Problem diagnosed by Victor Duchovni, Morgan Stanley.
+ The fix is to disable the smtp_chat_cmd() output flushing
+ code as it duplicates better code in smtp_loop(). File:
+ smtp/smtp_chat.c.
+
+20030823
+
+ Bugfix: vstream_popen() did not close the child pipe after
+ failure to fork(). File: util/vstream_popen.c.
+
+20040913
+
+ Bugfix (introduced 20020803): sent the wrong bounce message
+ type when a Delivered-To: loop was detected for a mailing
+ list alias. Nicolas Riendeau. File: bounce_notify_util.c.
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/conf/header_checks
--- a/gnu/dist/postfix/conf/header_checks Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/conf/header_checks Sat Nov 13 05:05:16 2004 +0000
@@ -297,7 +297,7 @@
#
# /etc/postfix/header_checks:
# /^content-(type|disposition):.*name[[:space:]]*=.*\.(exe|vbs)/
-# REJECT Bad attachment file name extension: $1
+# REJECT Bad attachment file name extension: $2
#
# Body pattern to stop a specific HTML browser vulnerability
# exploit.
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/examples/smtpd-policy/spf.pl
--- a/gnu/dist/postfix/examples/smtpd-policy/spf.pl Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/examples/smtpd-policy/spf.pl Sat Nov 13 05:05:16 2004 +0000
@@ -196,7 +196,7 @@
if ($result eq "pass") { return "DUNNO"; }
elsif ($result eq "fail") { return "REJECT " . ($smtp_comment || $header_comment); }
- elsif ($result eq "error") { return "450 temporary failure: $smtp_comemnt"; }
+ elsif ($result eq "error") { return "450 temporary failure: $smtp_comment"; }
else { return "DUNNO"; }
# unknown, softfail, and none all return DUNNO
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/html/header_checks.5.html
--- a/gnu/dist/postfix/html/header_checks.5.html Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/html/header_checks.5.html Sat Nov 13 05:05:16 2004 +0000
@@ -303,7 +303,7 @@
/etc/postfix/header_checks:
/^content-(type|disposition):.*name[[:space:]]*=.*\.(exe|vbs)/
- REJECT Bad attachment file name extension: $1
+ REJECT Bad attachment file name extension: $2
Body pattern to stop a specific HTML browser vulnerability
exploit.
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/html/postconf.5.html
--- a/gnu/dist/postfix/html/postconf.5.html Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/html/postconf.5.html Sat Nov 13 05:05:16 2004 +0000
@@ -4854,10 +4854,10 @@
address extension.
<li> Look up the "user+extension" address local part when the
-recipient domain equals $<a href="postconf.5.html#myorigin">myorigin</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, $<a href="postconf.5.html#inet_interfaces">inet_interfaces</a>
+sender domain equals $<a href="postconf.5.html#myorigin">myorigin</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, $<a href="postconf.5.html#inet_interfaces">inet_interfaces</a>
or $<a href="postconf.5.html#proxy_interfaces">proxy_interfaces</a>.
-<li> Look up the "user" address local part when the recipient domain
+<li> Look up the "user" address local part when the sender domain
equals $<a href="postconf.5.html#myorigin">myorigin</a>, $<a href="postconf.5.html#mydestination">mydestination</a>, $<a href="postconf.5.html#inet_interfaces">inet_interfaces</a> or $<a
href="postconf.5.html#proxy_interfaces">proxy_interfaces</a>.
<li> Look up the "@domain.tld" part.
@@ -6663,9 +6663,8 @@
or $<a href="postconf.5.html#proxy_interfaces">proxy_interfaces</a>, but the recipient is not listed in
$<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, and $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a> is not null.
-<li> The recipient domain matches $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a> but the
-recipient is not listed in $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a>, and $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a>
-is not null.
+<li> The recipient domain matches $<a href="postconf.5.html#virtual_alias_domains">virtual_alias_domains</a> but the
+recipient is not listed in $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a>.
<li> The recipient domain matches $<a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a> but the
recipient is not listed in $<a href="postconf.5.html#virtual_mailbox_maps">virtual_mailbox_maps</a>, and $<a href="postconf.5.html#virtual_mailbox_maps">virtual_mailbox_maps</a>
@@ -6698,9 +6697,8 @@
$<a href="postconf.5.html#proxy_interfaces">proxy_interfaces</a>, but the recipient is not listed in
$<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>, and $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a> is not null.
-<li> The sender domain matches $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a> but the recipient
-is not listed in $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a>, and $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a> is
-not null.
+<li> The sender domain matches $<a href="postconf.5.html#virtual_alias_domains">virtual_alias_domains</a> but the recipient
+is not listed in $<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a>.
<li> The sender domain matches $<a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a> but the
recipient is not listed in $<a href="postconf.5.html#virtual_mailbox_maps">virtual_mailbox_maps</a>, and $<a href="postconf.5.html#virtual_mailbox_maps">virtual_mailbox_maps</a>
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/man/man5/header_checks.5
--- a/gnu/dist/postfix/man/man5/header_checks.5 Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/man/man5/header_checks.5 Sat Nov 13 05:05:16 2004 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: header_checks.5,v 1.1.1.3 2004/07/28 22:49:03 heas Exp $
+.\" $NetBSD: header_checks.5,v 1.1.1.4 2004/11/13 05:05:30 heas Exp $
.\"
.TH HEADER_CHECKS 5
.ad
@@ -284,7 +284,7 @@
.ti +4
/^content-(type|disposition):.*name[[:space:]]*=.*\\.(exe|vbs)/
.ti +8
-REJECT Bad attachment file name extension: $1
+REJECT Bad attachment file name extension: $2
.ad
.fi
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/proto/header_checks
--- a/gnu/dist/postfix/proto/header_checks Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/proto/header_checks Sat Nov 13 05:05:16 2004 +0000
@@ -262,7 +262,7 @@
# .ti +4
# /^content-(type|disposition):.*name[[:space:]]*=.*\\.(exe|vbs)/
# .ti +8
-# REJECT Bad attachment file name extension: $1
+# REJECT Bad attachment file name extension: $2
#
# .ad
# .fi
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/proto/postconf.proto
--- a/gnu/dist/postfix/proto/postconf.proto Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/proto/postconf.proto Sat Nov 13 05:05:16 2004 +0000
@@ -3004,10 +3004,10 @@
address extension.
<li> Look up the "user+extension" address local part when the
-recipient domain equals $myorigin, $mydestination, $inet_interfaces
+sender domain equals $myorigin, $mydestination, $inet_interfaces
or $proxy_interfaces.
-<li> Look up the "user" address local part when the recipient domain
+<li> Look up the "user" address local part when the sender domain
equals $myorigin, $mydestination, $inet_interfaces or $proxy_interfaces.
<li> Look up the "@domain.tld" part.
@@ -6345,9 +6345,8 @@
or $proxy_interfaces, but the recipient is not listed in
$local_recipient_maps, and $local_recipient_maps is not null.
-<li> The recipient domain matches $virtual_alias_maps but the
-recipient is not listed in $virtual_alias_maps, and $virtual_alias_maps
-is not null.
+<li> The recipient domain matches $virtual_alias_domains but the
+recipient is not listed in $virtual_alias_maps.
<li> The recipient domain matches $virtual_mailbox_domains but the
recipient is not listed in $virtual_mailbox_maps, and $virtual_mailbox_maps
@@ -6376,9 +6375,8 @@
$proxy_interfaces, but the recipient is not listed in
$local_recipient_maps, and $local_recipient_maps is not null.
-<li> The sender domain matches $virtual_alias_maps but the recipient
-is not listed in $virtual_alias_maps, and $virtual_alias_maps is
-not null.
+<li> The sender domain matches $virtual_alias_domains but the recipient
+is not listed in $virtual_alias_maps.
<li> The sender domain matches $virtual_mailbox_domains but the
recipient is not listed in $virtual_mailbox_maps, and $virtual_mailbox_maps
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/src/bounce/bounce_notify_util.c
--- a/gnu/dist/postfix/src/bounce/bounce_notify_util.c Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/src/bounce/bounce_notify_util.c Sat Nov 13 05:05:16 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bounce_notify_util.c,v 1.1.1.7 2004/05/31 00:24:26 heas Exp $ */
+/* $NetBSD: bounce_notify_util.c,v 1.1.1.8 2004/11/13 05:05:38 heas Exp $ */
/*++
/* NAME
@@ -347,12 +347,10 @@
* Initialize the bounce_info structure. Forge a logfile record for just
* one recipient.
*/
-#define REALLY_BOUNCE 1
-
log_handle = bounce_log_forge(orig_recipient, recipient, offset, dsn_status,
dsn_action, why);
bounce_info = bounce_mail_alloc("none", queue_name, queue_id,
- encoding, REALLY_BOUNCE, log_handle);
+ encoding, BOUNCE_MSG_FAIL, log_handle);
return (bounce_info);
}
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/src/global/mail_version.h
--- a/gnu/dist/postfix/src/global/mail_version.h Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/src/global/mail_version.h Sat Nov 13 05:05:16 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.1.1.16 2004/07/28 22:49:16 heas Exp $ */
+/* $NetBSD: mail_version.h,v 1.1.1.17 2004/11/13 05:05:43 heas Exp $ */
#ifndef _MAIL_VERSION_H_INCLUDED_
#define _MAIL_VERSION_H_INCLUDED_
@@ -22,8 +22,8 @@
* Patches change the patchlevel and the release date. Snapshots change the
* release date only.
*/
-#define MAIL_RELEASE_DATE "20040628"
-#define MAIL_VERSION_NUMBER "2.1.4"
+#define MAIL_RELEASE_DATE "20040915"
+#define MAIL_VERSION_NUMBER "2.1.5"
#define VAR_MAIL_VERSION "mail_version"
#ifdef SNAPSHOT
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/src/smtp/smtp_chat.c
--- a/gnu/dist/postfix/src/smtp/smtp_chat.c Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/src/smtp/smtp_chat.c Sat Nov 13 05:05:16 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smtp_chat.c,v 1.1.1.5 2004/05/31 00:24:46 heas Exp $ */
+/* $NetBSD: smtp_chat.c,v 1.1.1.6 2004/11/13 05:05:53 heas Exp $ */
/*++
/* NAME
@@ -153,6 +153,13 @@
smtp_fputs(STR(state->buffer), LEN(state->buffer), session->stream);
/*
+ * This code is in the wrong place and can run before an I/O error
+ * handler is set up. To make matters worse, this code pre-empts better
+ * output flushing code that sits in the smtp_xfer() routine.
+ */
+#if 0
+
+ /*
* Flush unsent data to avoid timeouts after slow DNS lookups.
*/
if (time((time_t *) 0) - vstream_ftime(session->stream) > 10)
@@ -165,6 +172,7 @@
vstream_longjmp(session->stream, SMTP_ERR_TIME);
if (vstream_ferror(session->stream))
vstream_longjmp(session->stream, SMTP_ERR_EOF);
+#endif
}
/* smtp_chat_resp - read and process SMTP server response */
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/src/spawn/spawn.c
--- a/gnu/dist/postfix/src/spawn/spawn.c Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/src/spawn/spawn.c Sat Nov 13 05:05:16 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spawn.c,v 1.1.1.5 2004/07/28 22:49:30 heas Exp $ */
+/* $NetBSD: spawn.c,v 1.1.1.6 2004/11/13 05:05:59 heas Exp $ */
/*++
/* NAME
@@ -249,6 +249,10 @@
msg_fatal("request to use privileged group id %ld", (long) attr->gid);
if (attr->gid == var_owner_gid)
msg_fatal("request to use mail system owner group id %ld", (long) attr->gid);
+ if (attr->uid == (uid_t) (-1))
+ msg_fatal("user must not have user ID -1");
+ if (attr->gid == (gid_t) (-1))
+ msg_fatal("user must not have group ID -1");
/*
* Give the poor tester a clue of what is going on.
diff -r 03a395d5689a -r 32006cf216e2 gnu/dist/postfix/src/util/spawn_command.c
--- a/gnu/dist/postfix/src/util/spawn_command.c Sat Nov 13 03:20:37 2004 +0000
+++ b/gnu/dist/postfix/src/util/spawn_command.c Sat Nov 13 05:05:16 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spawn_command.c,v 1.1.1.2 2004/05/31 00:25:01 heas Exp $ */
+/* $NetBSD: spawn_command.c,v 1.1.1.3 2004/11/13 05:06:03 heas Exp $ */
Home |
Main Index |
Thread Index |
Old Index