From: Timo Sirainen <tss@iki.fi>
Date: Thu, 17 Jun 2010 13:47:27 +0000 (+0100)
Subject: imap, pop3, lmtp: Close network sockets with net_disconnect().
X-Git-Tag: 2.0.rc1~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a9e243069768d12c6d94c2699284a0ba81f1ac7;p=thirdparty%2Fdovecot%2Fcore.git

imap, pop3, lmtp: Close network sockets with net_disconnect().

--HG--
branch : HEAD
---

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index df8f08d7fe..16d60c2d58 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -211,12 +211,9 @@ void client_destroy(struct client *client, const char *reason)
 	i_stream_destroy(&client->input);
 	o_stream_destroy(&client->output);
 
-	if (close(client->fd_in) < 0)
-		i_error("close(client in) failed: %m");
-	if (client->fd_in != client->fd_out) {
-		if (close(client->fd_out) < 0)
-			i_error("close(client out) failed: %m");
-	}
+	net_disconnect(client->fd_in);
+	if (client->fd_in != client->fd_out)
+		net_disconnect(client->fd_out);
 
 	if (array_is_created(&client->search_saved_uidset))
 		array_free(&client->search_saved_uidset);
diff --git a/src/lmtp/client.c b/src/lmtp/client.c
index dc6f095f78..df7e456797 100644
--- a/src/lmtp/client.c
+++ b/src/lmtp/client.c
@@ -260,12 +260,9 @@ void client_destroy(struct client *client, const char *prefix,
 	i_stream_destroy(&client->input);
 	o_stream_destroy(&client->output);
 
-	if (close(client->fd_in) < 0)
-		i_error("close(client in) failed: %m");
-	if (client->fd_in != client->fd_out) {
-		if (close(client->fd_out) < 0)
-			i_error("close(client out) failed: %m");
-	}
+	net_disconnect(client->fd_in);
+	if (client->fd_in != client->fd_out)
+		net_disconnect(client->fd_out);
 	client_state_reset(client);
 	pool_unref(&client->state_pool);
 	pool_unref(&client->pool);
diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index e0bbabae22..6e2510394f 100644
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -425,12 +425,9 @@ void client_destroy(struct client *client, const char *reason)
 	i_stream_destroy(&client->input);
 	o_stream_destroy(&client->output);
 
-	if (close(client->fd_in) < 0)
-		i_error("close(client in) failed: %m");
-	if (client->fd_in != client->fd_out) {
-		if (close(client->fd_out) < 0)
-			i_error("close(client out) failed: %m");
-	}
+	net_disconnect(client->fd_in);
+	if (client->fd_in != client->fd_out)
+		net_disconnect(client->fd_out);
 	mail_storage_service_user_free(&client->service_user);
 	i_free(client);