From 709dd6ee2a3fae96c96d57183236db5f9935a86b Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Sat, 24 Mar 2001 00:00:00 -0500
Subject: [PATCH] snapshot-20010324

---
 postfix/src/flush/flush.c         | 6 ++++--
 postfix/src/global/mail_version.h | 2 +-
 postfix/src/util/inet_trigger.c   | 1 +
 postfix/src/util/stream_trigger.c | 1 +
 postfix/src/util/unix_trigger.c   | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/postfix/src/flush/flush.c b/postfix/src/flush/flush.c
index eb6a24dcb..29e2a3a50 100644
--- a/postfix/src/flush/flush.c
+++ b/postfix/src/flush/flush.c
@@ -249,7 +249,8 @@ static int flush_add_service(const char *site, const char *queue_id)
      * Map site to path and update log.
      */
     site_path = flush_site_to_path((VSTRING *) 0, site);
-    status = flush_add_path(STR(site_path), queue_id);
+    status = valid_hostname(STR(site_path), DONT_GRIPE) ?
+	flush_add_path(STR(site_path), queue_id) : FLUSH_STAT_BAD;
     vstring_free(site_path);
 
     return (status);
@@ -317,7 +318,8 @@ static int flush_send_service(const char *site)
      * Map site name to path name and flush the log.
      */
     site_path = flush_site_to_path((VSTRING *) 0, site);
-    status = flush_send_path(STR(site_path));
+    status = valid_hostname(STR(site_path), DONT_GRIPE) ?
+	flush_send_path(STR(site_path)) : FLUSH_STAT_BAD;
     vstring_free(site_path);
 
     return (status);
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 38259bcc5..b11e3b085 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-20010323"
+#define DEF_MAIL_VERSION	"Snapshot-20010324"
 extern char *var_mail_version;
 
 /* LICENSE
diff --git a/postfix/src/util/inet_trigger.c b/postfix/src/util/inet_trigger.c
index ace14ab0e..6907d56cd 100644
--- a/postfix/src/util/inet_trigger.c
+++ b/postfix/src/util/inet_trigger.c
@@ -79,6 +79,7 @@ static void inet_trigger_event(int event, char *context)
      */
     if (event == EVENT_TIME)
 	msg_warn("%s: read timeout for service %s", myname, ip->service);
+    event_disable_readwrite(ip->fd);
     if (close(ip->fd) < 0)
 	msg_warn("%s: close %s: %m", myname, ip->service);
     myfree(ip->service);
diff --git a/postfix/src/util/stream_trigger.c b/postfix/src/util/stream_trigger.c
index ee59b6c28..b064a7963 100644
--- a/postfix/src/util/stream_trigger.c
+++ b/postfix/src/util/stream_trigger.c
@@ -76,6 +76,7 @@ static void stream_trigger_event(int event, char *context)
      */
     if (event == EVENT_TIME)
 	msg_warn("%s: read timeout for service %s", myname, sp->service);
+    event_disable_readwrite(sp->fd);
     if (close(sp->fd) < 0)
 	msg_warn("%s: close %s: %m", myname, sp->service);
     myfree(sp->service);
diff --git a/postfix/src/util/unix_trigger.c b/postfix/src/util/unix_trigger.c
index 498a6c07a..0bf8ae15f 100644
--- a/postfix/src/util/unix_trigger.c
+++ b/postfix/src/util/unix_trigger.c
@@ -77,6 +77,7 @@ static void unix_trigger_event(int event, char *context)
      */
     if (event == EVENT_TIME)
 	msg_warn("%s: read timeout for service %s", myname, up->service);
+    event_disable_readwrite(up->fd);
     if (close(up->fd) < 0)
 	msg_warn("%s: close %s: %m", myname, up->service);
     myfree(up->service);