From: Wietse Venema <wietse@porcupine.org>
Date: Fri, 5 Jan 2001 05:00:00 +0000 (-0500)
Subject: snapshot-20010105
X-Git-Tag: v20010228~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4cca51f383fb7eba3e03eb9e71a273c1923424;p=thirdparty%2Fpostfix.git

snapshot-20010105
---

diff --git a/postfix/FILTER_README b/postfix/FILTER_README
index 6823d0be7..5c8c495c0 100644
--- a/postfix/FILTER_README
+++ b/postfix/FILTER_README
@@ -62,14 +62,17 @@ The filter program can start out as a simple shell script like this:
     EX_UNAVAILABLE=69
     STATUS=$EX_TEMPFAIL
 
-    cd $INSPECT_DIR || { echo $INSPECT_DIR does not exist; exit $EX_TEMPFAIL; }
-
     # Clean up when done or when aborting.
     trap "rm -f in.$$; exit $STATUS" 0 1 2 3 15
 
-    cat >in.$$ || { echo Cannot save mail to file; exit $EX_TEMPFAIL; }
+    quit() { STATUS=${1-$?}; exit; }
+
+    # Start processing.
+    cd $INSPECT_DIR || { echo $INSPECT_DIR does not exist; quit $EX_TEMPFAIL; }
+
+    cat >in.$$ || { echo Cannot save mail to file; quit $EX_TEMPFAIL; }
 
-    # filter <in.$$ || { echo Message content rejected; exit $EX_UNAVAILABLE; }
+    # filter <in.$$ || { echo Message content rejected; quit $EX_UNAVAILABLE; }
 
     $SENDMAIL "$@" <in.$$
 
diff --git a/postfix/HISTORY b/postfix/HISTORY
index 2cf223746..119b64245 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -4671,3 +4671,40 @@ Apologies for any names omitted.
 	for unimplemented operations, causing "postmap -d" to dump
 	core instead if issuing an error message. This is what I
 	get for accepting code that I cannot test myself.
+
+20001220
+
+	Feature: merged in Andrew McNamara's virtual delivery agent
+	(a table-driven agent that does not require recipients to
+	have UNIX accounts, and that implements a safe subset of
+	the default local delivery agent). Files: virtual/*.
+
+20001221
+
+	Code cleanup: configuration parameters that are $name
+	expanded at run-time now have their own data type hierarchy
+	instead of being piggy-backed on top of strings that are
+	$name expanded at program initialization time.  Files:
+	global/mail_conf.h, global/mail_conf_raw.c, and code that
+	calls it.
+
+20001230
+
+	Update: replaced the default rbl.maps.vix.com setting by
+	the current blackholes.mail-abuse.org.
+
+20010102
+
+	Code cleanup: the queue manager is a bit greedier with
+	allocating a delivery agent. Problem pointed out by Patrik
+	Rak. All bugs in the solution are mine.  Files:
+	*qmgr/qmgr_active.c.
+
+20010105
+
+	Bugfix: the FILTER_README shell script example did not
+	correctly pass exit status to the parent.
+
+	Bugfix: soft errors in client hostname lookups would be
+	treated as hard errors. Fix by Michael Herrmann
+	(informatik.tu-muenchen.de). File: smtpd/smtpd_peer.c.
diff --git a/postfix/SASL_README b/postfix/SASL_README
index 45c48921c..60da041b0 100644
--- a/postfix/SASL_README
+++ b/postfix/SASL_README
@@ -78,7 +78,7 @@ Enabling SASL authentication in the Postfix SMTP server
 If you installed the Cyrus SASL libraries as per the default, you
 will have to symlink /usr/lib/sasl -> /usr/local/lib/sasl.
 
-See conf/sample-sasl.cf for examples. 
+See conf/sample-auth.cf for examples. 
 
 In order to enable SASL support in the SMTP server:
 
diff --git a/postfix/conf/sample-smtpd.cf b/postfix/conf/sample-smtpd.cf
index f54e33a00..02df49246 100644
--- a/postfix/conf/sample-smtpd.cf
+++ b/postfix/conf/sample-smtpd.cf
@@ -284,7 +284,8 @@ allow_untrusted_routing = no
 # network address, and reject service if it is listed below any of
 # the following domains.
 #
-maps_rbl_domains = rbl.maps.vix.com
+#maps_rbl_domains = blackholes.mail-abuse.org dialups.mail-abuse.org
+maps_rbl_domains = blackholes.mail-abuse.org
 
 # The relay_domains parameter restricts what client hostname domains
 # (and subdomains thereof) this mail system will relay mail from,
diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index cc4c75a1f..8ff8a2a19 100644
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -1013,7 +1013,7 @@ extern int var_access_map_code;
 extern int var_maps_rbl_code;
 
 #define VAR_MAPS_RBL_DOMAINS	"maps_rbl_domains"
-#define DEF_MAPS_RBL_DOMAINS	"rbl.maps.vix.com"
+#define DEF_MAPS_RBL_DOMAINS	"blackholes.mail-abuse.org"
 extern char *var_maps_rbl_domains;
 
 #define VAR_SMTPD_DELAY_REJECT	"smtpd_delay_reject"
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 3a69655e4..0b70e3714 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -15,7 +15,7 @@
   * Version of this program.
   */
 #define VAR_MAIL_VERSION	"mail_version"
-#define DEF_MAIL_VERSION	"Snapshot-20001224"
+#define DEF_MAIL_VERSION	"Snapshot-20010105"
 extern char *var_mail_version;
 
 /* LICENSE
diff --git a/postfix/src/nqmgr/qmgr_active.c b/postfix/src/nqmgr/qmgr_active.c
index b34f6e7ef..ec00584bd 100644
--- a/postfix/src/nqmgr/qmgr_active.c
+++ b/postfix/src/nqmgr/qmgr_active.c
@@ -467,10 +467,10 @@ void    qmgr_active_drain(void)
     QMGR_TRANSPORT *transport;
 
     /*
-     * Use round-robin search to find a transport with pending mail. Allocate
-     * a delivery process. The process allocation completes asynchronously.
+     * Allocate one delivery process for every transport with pending mail.
+     * The process allocation completes asynchronously.
      */
-    if ((transport = qmgr_transport_select()) != 0) {
+    while ((transport = qmgr_transport_select()) != 0) {
 	if (msg_verbose)
 	    msg_info("qmgr_active_drain: allocate %s", transport->name);
 	qmgr_transport_alloc(transport, qmgr_deliver);
diff --git a/postfix/src/qmgr/qmgr_active.c b/postfix/src/qmgr/qmgr_active.c
index b34f6e7ef..ec00584bd 100644
--- a/postfix/src/qmgr/qmgr_active.c
+++ b/postfix/src/qmgr/qmgr_active.c
@@ -467,10 +467,10 @@ void    qmgr_active_drain(void)
     QMGR_TRANSPORT *transport;
 
     /*
-     * Use round-robin search to find a transport with pending mail. Allocate
-     * a delivery process. The process allocation completes asynchronously.
+     * Allocate one delivery process for every transport with pending mail.
+     * The process allocation completes asynchronously.
      */
-    if ((transport = qmgr_transport_select()) != 0) {
+    while ((transport = qmgr_transport_select()) != 0) {
 	if (msg_verbose)
 	    msg_info("qmgr_active_drain: allocate %s", transport->name);
 	qmgr_transport_alloc(transport, qmgr_deliver);
diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c
index 0fdf61d04..febdc3701 100644
--- a/postfix/src/sendmail/sendmail.c
+++ b/postfix/src/sendmail/sendmail.c
@@ -735,7 +735,8 @@ int     main(int argc, char **argv)
      * reset the saved set-userid, which would be a security vulnerability.
      */
     if (geteuid() == 0 && getuid() != 0) {
-	msg_warn("sendmail is set-uid root, or is run from a set-uid root process");
+	msg_warn("sendmail has set-uid root file permissions, or is run from a set-uid root process");
+	msg_warn("the Postfix sendmail command must be installed without set-uid root file permissions");
 	set_ugid(getuid(), getgid());
     }
 
diff --git a/postfix/src/smtpd/smtpd_peer.c b/postfix/src/smtpd/smtpd_peer.c
index 2ac0947cd..42c4b2543 100644
--- a/postfix/src/smtpd/smtpd_peer.c
+++ b/postfix/src/smtpd/smtpd_peer.c
@@ -148,7 +148,7 @@ void    smtpd_peer_init(SMTPD_STATE *state)
 #define REJECT_PEER_NAME(state, code) { \
 	myfree(state->name); \
 	state->name = mystrdup("unknown"); \
-	state->peer_code = 5; \
+	state->peer_code = code; \
     }
 
 	    hp = gethostbyname(state->name);	/* clobbers hp->name!! */