From 21a04aa376e91125fa8c289c5c9502873c7166ec Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Fri, 22 Sep 2006 08:41:59 +0000 Subject: [PATCH] Apply patch to fix bug introduced by the last patch to spool_mbox.c (from Nico Erfurth). --- doc/doc-txt/ChangeLog | 5 +++-- src/src/spool_mbox.c | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index ac92dfbc3..eebf9122d 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.395 2006/09/19 20:01:13 jetmore Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.396 2006/09/22 08:41:59 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -34,7 +34,8 @@ PH/03 On Solaris, an unexpectedly close socket (dropped connection) can PH/04 Applied Nico Erfurth's refactoring patch to tidy up mime.c (quoted-printable decoding). -PH/05 Applied Nico Efrurth's refactoring patch to tidy up spool_mbox.c. +PH/05 Applied Nico Efrurth's refactoring patch to tidy up spool_mbox.c, and + later the small subsequent patch to fix an introduced bug. PH/06 Installed the latest Cygwin Makefile from the Cygwin maintainer. diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c index 69b0995ad..e723cd8c9 100644 --- a/src/src/spool_mbox.c +++ b/src/src/spool_mbox.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/spool_mbox.c,v 1.12 2006/09/12 10:35:56 ph10 Exp $ */ +/* $Cambridge: exim/src/src/spool_mbox.c,v 1.13 2006/09/22 08:41:59 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -140,6 +140,9 @@ FILE *spool_mbox(unsigned long *mbox_file_size) { }; } while (j > 0); + (void)fclose(mbox_file); + mbox_file = NULL; + Ustrcpy(spooled_message_id, message_id); spool_mbox_ok = 1; }; -- 2.25.1