yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 03:50:08 +02:00
Code Issues Releases Wiki Activity

disonnect SMTP after configure

Browse source
This commit is contained in:
B. Petersen 2018-05-23 01:00:52 +02:00
parent 01077325a9
commit 47642f9cb0
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/mrmailbox_configure.c
View file

@ -396,7 +396,7 @@ cleanup:
int mrmailbox_configure(mrmailbox_t* mailbox) int mrmailbox_configure(mrmailbox_t* mailbox)
{ {
int success = 0, locked = 0, i; int success = 0, locked = 0, i;
int imap_connected_here = 0; int imap_connected_here = 0, smtp_connected_here = 0;
int recreate_job_thread = 0; int recreate_job_thread = 0;
mrloginparam_t* param = NULL; mrloginparam_t* param = NULL;
@ -653,6 +653,7 @@ int mrmailbox_configure(mrmailbox_t* mailbox)
if( !mrimap_connect(mailbox->m_imap, param) ) { if( !mrimap_connect(mailbox->m_imap, param) ) {
goto cleanup; goto cleanup;
} }
imap_connected_here = 1; imap_connected_here = 1;
PROGRESS(800) PROGRESS(800)
@ -675,6 +676,8 @@ int mrmailbox_configure(mrmailbox_t* mailbox)
} }
} }
smtp_connected_here = 1;
PROGRESS(900) PROGRESS(900)
/* configuration success - write back the configured parameters with the "configured_" prefix; also write the "configured"-flag */ /* configuration success - write back the configured parameters with the "configured_" prefix; also write the "configured"-flag */
@ -690,11 +693,13 @@ int mrmailbox_configure(mrmailbox_t* mailbox)
success = 1; success = 1;
mrmailbox_log_info(mailbox, 0, "Configure completed successfully."); mrmailbox_log_info(mailbox, 0, "Configure completed successfully.");
PROGRESS(950)
cleanup: cleanup:
if( locked ) { mrsqlite3_unlock(mailbox->m_sql); } if( locked ) { mrsqlite3_unlock(mailbox->m_sql); }
if( imap_connected_here ) {
mrimap_disconnect(mailbox->m_imap); if( imap_connected_here ) { mrimap_disconnect(mailbox->m_imap); }
} if( smtp_connected_here ) { mrsmtp_disconnect(mailbox->m_smtp); }
mrloginparam_unref(param); mrloginparam_unref(param);
mrloginparam_unref(param_autoconfig); mrloginparam_unref(param_autoconfig);
free(param_addr_urlencoded); free(param_addr_urlencoded);