Paul B. Henson:
> On Thu, Jun 02, 2011 at 05:41:55PM -0700, Wietse Venema wrote:
>
> > Well no-one told me it happens with "sendmail -t", so I did not
> > test for that option (or the bazillion other permutations of Postfix
> > options). Let this be a reminder that a problem report should
> > contain all the information that is necessary to reproduce the
> > condition.
>
> Well, I did include the test I was using in my original post:
>
> $ (printf "From: rootcsupomona.edu\nTo: hensoncsupomona.edu\nSubject: big
> email test\n\n"; yes test | head -c 10000000) | /usr/sbin/sendmail -t
> sendmail: fatal: henson(1005): internal protocol error
I missed that. Below is the final patch.
Instead of yesterday's patch which adds (duplicated) input validation
support after write error, the final version simply disables input
validation after write error.
Wietse
[file: 20110603-postdrop-patch]
20110603
Bugfix (introduced: Postfix 2.7): "sendmail -t" reported
"protocol error" after queue file write error. File:
postdrop/postdrop.c.
*** /var/tmp/postfix-2.9-20110501/src/postdrop/postdrop.c Fri Jan 15
20:21:50 2010
--- src/postdrop/postdrop.c Fri Jun 3 07:58:04 2011
***************
*** 235,240 ****
--- 235,241 ----
int saved_errno;
int from_count = 0;
int rcpt_count = 0;
+ int validate_input = 1;
/*
* Fingerprint executables and core dumps.
***************
*** 453,458 ****
--- 454,460 ----
&& rec_type != REC_TYPE_EOF)
if (rec_type == REC_TYPE_ERROR)
msg_fatal("uid=%ld: malformed input", (long) uid);
+ validate_input = 0;
errno = saved_errno;
break;
}
***************
*** 478,484 ****
* the segment terminator records, there aren't any other mandatory
* records in a Postfix submission queue file.
*/
! if (from_count == 0 || rcpt_count == 0) {
status = CLEANUP_STAT_BAD;
mail_stream_cleanup(dst);
}
--- 480,486 ----
* the segment terminator records, there aren't any other mandatory
* records in a Postfix submission queue file.
*/
! if (validate_input && (from_count == 0 || rcpt_count == 0)) {
status = CLEANUP_STAT_BAD;
mail_stream_cleanup(dst);
}
