dovecot-2.2: lib-lda: And fixed the earlier commit.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/6142d6b2ae98
changeset: 17962:6142d6b2ae98
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 17 10:02:54 2014 -0700
description:
lib-lda: And fixed the earlier commit.

diffstat:

 src/lib-lda/duplicate.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r f1deba7bc3e3 -r 6142d6b2ae98 src/lib-lda/duplicate.c
--- a/src/lib-lda/duplicate.c	Fri Oct 17 09:59:21 2014 -0700
+++ b/src/lib-lda/duplicate.c	Fri Oct 17 10:02:54 2014 -0700
@@ -323,16 +323,14 @@
 	if (o_stream_nfinish(output) < 0) {
 		i_error("write(%s) failed: %m", file->path);
 		o_stream_unref(&output);
-		file_dotlock_delete(&file->dotlock);
-		file->new_fd = -1;
+		duplicate_file_free(&ctx->file);
 		return;
 	}
 	o_stream_unref(&output);
 
-	file->changed = FALSE;
 	if (file_dotlock_replace(&file->dotlock, 0) < 0)
 		i_error("file_dotlock_replace(%s) failed: %m", file->path);
-	file->new_fd = -1;
+	duplicate_file_free(&ctx->file);
 }
 
 struct duplicate_context *duplicate_init(struct mail_user *user)