From: Wietse Venema <wietse@porcupine.org>
Date: Sat, 10 Apr 1999 05:00:00 +0000 (-0500)
Subject: snapshot-19990410
X-Git-Tag: v20010228~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36937a7745581caba1d09f4b975ae9645c9ba037;p=thirdparty%2Fpostfix.git

snapshot-19990410
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 4531b2e4e..48a8751dd 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -2445,7 +2445,7 @@ Apologies for any names omitted.
 
 19990326
 
-	Compatibility: Postfix now puts to spaces after the sender
+	Compatibility: Postfix now puts two spaces after the sender
 	in a "From sender date..." header. Found by John A. Martin,
 	fixed by Lamont Jones, Hewlett-Packard.
 
@@ -2495,7 +2495,7 @@ Apologies for any names omitted.
 	Feature: new dictionary types can be registered with
 	dict_open_register(). File: util/dict_open.c.
 
-1990330
+19990330
 
 	Bug fix: match_list membership dictionary lookups were case
 	sensitive when they should not. Patch by Lutz Jaenicke,
@@ -2596,6 +2596,12 @@ Apologies for any names omitted.
 	Jones, Hewlett-Packard.  It is to be expected that full
 	content filtering will be delegated to an external command.
 
+19990410
+
+	Bugfix: auto-detection of changes to DB or DBM lookup
+	tables wan't done for TCP connections.
+
+
 Future:
 
 	Planned: must be able to list the same hash table in
diff --git a/postfix/bounce/bounce_notify_service.c b/postfix/bounce/bounce_notify_service.c
index 5b15104fd..075896d51 100644
--- a/postfix/bounce/bounce_notify_service.c
+++ b/postfix/bounce/bounce_notify_service.c
@@ -122,7 +122,7 @@ static int bounce_header(VSTREAM *bounce, VSTRING *buf, const char *dest,
      */
     post_mail_fprintf(bounce, "MIME-Version: 1.0");
     post_mail_fprintf(bounce, "Content-Type: %s; report-type=%s;",
-		      "multipart/report", "x-postfix-report");
+		      "multipart/report", "plain");
     post_mail_fprintf(bounce, "\tboundary=\"%s\"", boundary);
     post_mail_fputs(bounce, "");
     post_mail_fputs(bounce, "This is a MIME-encapsulated message.");
@@ -213,7 +213,7 @@ static int bounce_diagnostics(char *service, VSTREAM *bounce, VSTRING *buf,
      */
     post_mail_fprintf(bounce, "--%s", boundary);
     post_mail_fprintf(bounce, "Content-Description: %s", "Delivery error report");
-    post_mail_fprintf(bounce, "Content-Type: %s", "text/x-postfix-report");
+    post_mail_fprintf(bounce, "Content-Type: %s", "text/plain");
     post_mail_fputs(bounce, "");
 
     /*
diff --git a/postfix/conf/main.cf.default b/postfix/conf/main.cf.default
index 20a1312bb..e1dd69fa6 100644
--- a/postfix/conf/main.cf.default
+++ b/postfix/conf/main.cf.default
@@ -61,7 +61,7 @@ luser_relay =
 mail_name = Postfix
 mail_owner = postfix
 mail_spool_directory = /var/mail
-mail_version = Snapshot-19990409
+mail_version = Snapshot-19990410
 mailbox_command = 
 mailbox_transport = 
 maps_rbl_domains = rbl.maps.vix.com
diff --git a/postfix/global/mail_version.h b/postfix/global/mail_version.h
index 2e4b49c4c..67394bfd5 100644
--- a/postfix/global/mail_version.h
+++ b/postfix/global/mail_version.h
@@ -15,7 +15,7 @@
   * Version of this program.
   */
 #define VAR_MAIL_VERSION	"mail_version"
-#define DEF_MAIL_VERSION	"Snapshot-19990409"
+#define DEF_MAIL_VERSION	"Snapshot-19990410"
 extern char *var_mail_version;
 
 /* LICENSE
diff --git a/postfix/master/multi_server.c b/postfix/master/multi_server.c
index 2f2cb4909..01d981129 100644
--- a/postfix/master/multi_server.c
+++ b/postfix/master/multi_server.c
@@ -330,6 +330,8 @@ static void multi_server_accept_inet(int unused_event, char *context)
     if (client_count == 0 && var_idle_limit > 0)
 	time_left = event_cancel_timer(multi_server_timeout, (char *) 0);
 
+    if (multi_server_pre_accept)
+	multi_server_pre_accept();
     fd = inet_accept(listen_fd);
     if (multi_server_lock != 0
 	&& myflock(vstream_fileno(multi_server_lock), MYFLOCK_NONE) < 0)
diff --git a/postfix/master/single_server.c b/postfix/master/single_server.c
index b3084ab1a..0922ce8c6 100644
--- a/postfix/master/single_server.c
+++ b/postfix/master/single_server.c
@@ -299,6 +299,8 @@ static void single_server_accept_inet(int unused_event, char *context)
     if (var_idle_limit > 0)
 	time_left = event_cancel_timer(single_server_timeout, (char *) 0);
 
+    if (single_server_pre_accept)
+	single_server_pre_accept();
     fd = inet_accept(listen_fd);
     if (single_server_lock != 0
 	&& myflock(vstream_fileno(single_server_lock), MYFLOCK_NONE) < 0)