imapc: Fix re-sending retryable commands after reconnect

dovecot · Jan 15, 2017 · d708ff3 · d708ff3
1 parent 00fc96e
commit d708ff3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
@@ -328,7 +328,7 @@ void imapc_client_mailbox_reconnect(struct imapc_client_mailbox *box)
 	   loop. */
 	box->reconnect_ok = FALSE;
 
-	imapc_connection_disconnect(box->conn);
+	imapc_connection_disconnect_full(box->conn, TRUE);
 	imapc_connection_connect(box->conn, imapc_client_reconnect_cb, box);
 }
 

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
@@ -376,8 +376,8 @@ imapc_connection_literal_reset(struct imapc_connection_literal *literal)
 	literal->fd = -1;
 }
 
-static void imapc_connection_disconnect_full(struct imapc_connection *conn,
-					     bool reconnecting)
+void imapc_connection_disconnect_full(struct imapc_connection *conn,
+				      bool reconnecting)
 {
 	/* timeout may be set also in disconnected state */
 	if (conn->to != NULL)

diff --git a/src/lib-imap-client/imapc-connection.h b/src/lib-imap-client/imapc-connection.h
@@ -33,6 +33,8 @@ void imapc_connection_connect(struct imapc_connection *conn,
 			      imapc_command_callback_t *login_callback,
 			      void *login_context) ATTR_NULL(2, 3);
 void imapc_connection_disconnect(struct imapc_connection *conn);
+void imapc_connection_disconnect_full(struct imapc_connection *conn,
+				      bool reconnecting);
 void imapc_connection_abort_commands(struct imapc_connection *conn,
 				     struct imapc_client_mailbox *only_box,
 				     bool keep_retriable) ATTR_NULL(2);