Before tckling the license problem.

svn path=/trunk/; revision=3462

5 files changed, 15 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 1a9704ec..9ac542c6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Make -D short option for --smtpaddress active again.
+* Typo fix for Polish translation.
+* Make sure IMAP capability checks are caseblind.
+* Make sure suffix checks on akalists are properly caseblinded.
+* All warning mail now has a generated date stamp.
+
 fetchmail-5.9.0 (Sun Aug 12 23:52:16 EDT 2001), 21062 lines:
 
 * Blush...# characters now go to stdout, same place as the dots.
diff --git a/env.c b/env.c
index 19593d72..3e9c52c3 100644
--- a/env.c
+++ b/env.c
@@ -186,7 +186,7 @@ char *rfc822timestamp(void)
      * Y2K hassles.  Max length of this timestamp in an English locale
      * should be 29 chars.  The only things that should vary by locale
      * are the day and month abbreviations.  The set_locale calls prevent
-     * weird multibyte i18n characters (such as kanji) for showing up
+     * weird multibyte i18n characters (such as kanji) from showing up
      * in your Received headers.
      */
 #if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
diff --git a/fetchmail.man b/fetchmail.man
index fac1439b..51874bae 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -1699,8 +1699,8 @@ When trying to determine the originating address of a message,
 fetchmail looks through headers in the following order: 
 
         Return-Path:
-        Resent-Sender: (ignored if it doesn't contain an @)
-        Sender: (ignored if it doesn't contain an @)
+        Resent-Sender: (ignored if it doesn't contain an @ or !)
+        Sender: (ignored if it doesn't contain an @ or !)
         Resent-From:
         From:
         Reply-To:
diff --git a/sink.c b/sink.c
index 3c19ed68..4fec6cb5 100644
--- a/sink.c
+++ b/sink.c
@@ -1139,20 +1139,20 @@ int open_warning_by_mail(struct query *ctl, struct msgblk *msg)
      * it's worth to compute.
      */
     struct msgblk reply = {NULL, NULL, "FETCHMAIL-DAEMON@", 0};
+    int status;
 
     strcat(reply.return_path, fetchmailhost);
 
     if (!MULTIDROP(ctl))		/* send to calling user */
     {
-	int status;
-
 	save_str(&reply.recipients, ctl->localnames->id, XMIT_ACCEPT);
 	status = open_sink(ctl, &reply, &good, &bad);
 	free_str_list(&reply.recipients);
-	return(status);
     }
     else				/* send to postmaster  */
-	return(open_sink(ctl, &reply, &good, &bad));
+	status = open_sink(ctl, &reply, &good, &bad);
+    stuff_warning(ctl, "Date: %s", rfc822timestamp());
+    return(status);
 }
 
 #if defined(HAVE_STDARG_H)
diff --git a/transact.c b/transact.c
index 2214b9ff..10db25fb 100644
--- a/transact.c
+++ b/transact.c
@@ -741,9 +741,9 @@ int readheaders(int sock,
 	 * (RFC2822 says the condents of Sender must be a valid mailbox
 	 * address, which is also what RFC822 4.4.4 implies.)
 	 */
-	else if (!strncasecmp("Sender:", line, 7) && strchr(line, '@'))
+	else if (!strncasecmp("Sender:", line, 7) && (strchr(line, '@') || strchr(line, '!')))
 	    sender_offs = (line - msgblk.headers);
-	else if (!strncasecmp("Resent-Sender:", line, 14) && strchr(line, '@'))
+	else if (!strncasecmp("Resent-Sender:", line, 14) && (strchr(line, '@') || strchr(line, '!')))
 	    resent_sender_offs = (line - msgblk.headers);
 
 #ifdef __UNUSED__