LMTP fix.

svn path=/trunk/; revision=3560

diff --git a/NEWS b/NEWS
index f2a01bc725f8f19751a11c9260e0b43904e40c02..5b5f010e4db9779b8b924f09533a435d059ba0d8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,12 +2,17 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* OPIE bug fixes by Jun Miyoshi <usako@omnisci.co.jp>.
+* Documented known IDLE bug in the todo.html file.
+* Sunil Shetye's fix for a timeout/reconnect bug.
+* LMTP fix from Toshiro HIKITA <toshi@sodan.org>.
+
 fetchmail-5.9.5 (Thu Nov  8 14:14:35 EST 2001), 21162 lines:
 
 * Changed the logging logic along lines suggested by Jan Klaverstijn,
 * fetchmailconf looks first in the directory it's running from to find
   fetchmail.
-* Make sure we vet a success status correctly from open_smtp_sink()
+* Make sure we get a success status correctly from open_smtp_sink()
   and open_bsmtp_sink().
 * Matthias Andree's env.c patch to refuse service when QMAILINJECT is defined.
 * Immediately abort if a non-empty QMAILINJECT environment variable is

diff --git a/sink.c b/sink.c
index 6ade2018e7aa5791ebcacf55cad440c36a3c6e37..c75286127d85c5582b7f5cfeda03284990b336c5 100644 (file)
--- a/sink.c
+++ b/sink.c
@@ -794,6 +794,12 @@ static int open_smtp_sink(struct query *ctl, struct msgblk *msg,
        return(handle_smtp_report(ctl, msg));
     }
 
+    /*
+     * We need to stash this away in order to know how many
+     * response lines to expect after the LMTP end-of-message.
+     */
+    lmtp_responses = *good_addresses;
+
     return(PS_SUCCESS);
 }
 
@@ -1016,12 +1022,6 @@ int open_sink(struct query *ctl, struct msgblk *msg,
     if (ctl->mda)              /* must deliver through an MDA */
        return(open_mda_sink(ctl, msg, good_addresses, bad_addresses));
 
-    /*
-     * We need to stash this away in order to know how many
-     * response lines to expect after the LMTP end-of-message.
-     */
-    lmtp_responses = *good_addresses;
-
     return(PS_SUCCESS);
 }