From 3026bfee3c04ba09f13e4345eec0d6fbe14cc146 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 14 Jul 2009 23:04:43 +0000 Subject: Remove 'message delimiter found while scanning headers' error message. RFC-5322 allows for messages without the CRLF+body part, so fetchmail should not complain about legal messages. svn path=/branches/BRANCH_6-3/; revision=5387 --- transact.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'transact.c') diff --git a/transact.c b/transact.c index b890c0cb..c6ea7e35 100644 --- a/transact.c +++ b/transact.c @@ -548,6 +548,7 @@ int readheaders(int sock, /* check for end of headers */ if (end_of_header(line)) { +eoh: if (linelen != strlen (line)) has_nuls = TRUE; free(line); @@ -561,15 +562,9 @@ int readheaders(int sock, */ if (protocol->delimited && line[0] == '.' && EMPTYLINE(line+1)) { - if (outlevel > O_SILENT) - report(stdout, - GT_("message delimiter found while scanning headers\n")); if (suppress_readbody) *suppress_readbody = TRUE; - if (linelen != strlen (line)) - has_nuls = TRUE; - free(line); - goto process_headers; + goto eoh; /* above */ } /* @@ -938,12 +933,12 @@ int readheaders(int sock, } } - process_headers: +process_headers: - if (retain_mail) - { + if (retain_mail) { return(PS_RETAINED); } + if (refuse_mail) return(PS_REFUSED); /* -- cgit v1.2.3