aboutsummaryrefslogtreecommitdiffstats
path: root/transact.c
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2009-07-14 23:04:43 +0000
committerMatthias Andree <matthias.andree@gmx.de>2009-07-14 23:04:43 +0000
commit3026bfee3c04ba09f13e4345eec0d6fbe14cc146 (patch)
tree810337cf10782296db9b57b037deff9afe0767e1 /transact.c
parent50836d76ed3293a51dfcd3328cf6919994edb604 (diff)
downloadfetchmail-3026bfee3c04ba09f13e4345eec0d6fbe14cc146.tar.gz
fetchmail-3026bfee3c04ba09f13e4345eec0d6fbe14cc146.tar.bz2
fetchmail-3026bfee3c04ba09f13e4345eec0d6fbe14cc146.zip
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
Diffstat (limited to 'transact.c')
-rw-r--r--transact.c15
1 files changed, 5 insertions, 10 deletions
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);
/*