From 62f09a9fff773fa08b019dbfb53b6637c2761bf4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 18 Jun 2018 21:07:48 +0200 Subject: [PATCH] do not delay the deletion of securejoin-messages --- src/mrmailbox_securejoin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mrmailbox_securejoin.c b/src/mrmailbox_securejoin.c index 949952f8..78b5422d 100644 --- a/src/mrmailbox_securejoin.c +++ b/src/mrmailbox_securejoin.c @@ -806,14 +806,14 @@ int mrmailbox_handle_securejoin_handshake(mrmailbox_t* mailbox, mrmimeparser_t* end_bobs_joining(mailbox, BOB_SUCCESS); } - // delete the message in 20 seconds - typical handshake last about 5 seconds, so do not disturb the connection _now_. - // for errors, we do not the corresoinding message at all, it may come eg. from another device or may be useful to find out what was going wrong. + // delete the message, as SMTP and IMAP is done in separate threads it should be okay to delete the message just now. + // for errors, we do not the corresponding message at all, it may come eg. from another device or may be useful to find out what was going wrong. if( ret == MR_IS_HANDSHAKE_STOP_NORMAL_PROCESSING ) { struct mailimf_field* field; if( (field=mrmimeparser_lookup_field(mimeparser, "Message-ID"))!=NULL && field->fld_type==MAILIMF_FIELD_MESSAGE_ID ) { struct mailimf_message_id* fld_message_id = field->fld_data.fld_message_id; if( fld_message_id && fld_message_id->mid_value ) { - mrjob_add(mailbox, MRJ_DELETE_MSG_ON_IMAP, mrmailbox_rfc724_mid_exists__(mailbox, fld_message_id->mid_value, NULL, NULL), NULL, 20); + mrjob_add(mailbox, MRJ_DELETE_MSG_ON_IMAP, mrmailbox_rfc724_mid_exists__(mailbox, fld_message_id->mid_value, NULL, NULL), NULL, 0); } } }