From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 23 Mar 2017 12:08:53 +0000 (+0200)
Subject: pop3: Start autoexpunging only after client is disconnected
X-Git-Tag: 2.3.0.rc1~1876
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9dad58173067427f68fd67c3cdc7412c3efedba;p=thirdparty%2Fdovecot%2Fcore.git

pop3: Start autoexpunging only after client is disconnected
---

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 8cf7800c28..0a8aad6f34 100644
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -613,10 +613,6 @@ static void client_default_destroy(struct client *client, const char *reason)
 			"\n", NULL));
 	}
 
-	/* refresh proctitle before a potentially long-running user unref */
-	pop3_refresh_proctitle();
-	mail_user_unref(&client->user);
-
 	if (client->session_dotlock != NULL)
 		file_dotlock_delete(&client->session_dotlock);
 	if (client->to_session_dotlock_refresh != NULL)
@@ -639,6 +635,10 @@ static void client_default_destroy(struct client *client, const char *reason)
 	o_stream_destroy(&client->output);
 
 	fd_close_maybe_stdio(&client->fd_in, &client->fd_out);
+
+	/* refresh proctitle before a potentially long-running user unref */
+	pop3_refresh_proctitle();
+	mail_user_unref(&client->user);
 	mail_storage_service_user_unref(&client->service_user);
 
 	pop3_client_count--;