@@ -430,17 +430,16 @@ delivery_status exmdb_local_deliverquota(MESSAGE_CONTEXT *pcontext,
430430 return delivery_status::temp_fail;
431431 }
432432
433- if (!g_lda_twostep) {
434- if (b_bounce_delivered)
435- return delivery_status::bounce_sent;
436- return delivery_status::ok;
433+ if (g_lda_twostep) {
434+ if (g_lda_mrautoproc)
435+ flags |= DELIVERY_DO_MRAUTOPROC;
436+ auto err = exmdb_local_rules_execute (home_dir, pcontext->ctrl .from ,
437+ address, folder_id, message_id, flags);
438+ if (err != ecSuccess)
439+ mlog (LV_ERR, " TWOSTEP ruleproc unsuccessful: %s" , mapi_strerror (err));
437440 }
438- if (g_lda_mrautoproc)
439- flags |= DELIVERY_DO_MRAUTOPROC;
440- auto err = exmdb_local_rules_execute (home_dir, pcontext->ctrl .from ,
441- address, folder_id, message_id, flags);
442- if (err != ecSuccess)
443- mlog (LV_ERR, " TWOSTEP ruleproc unsuccessful: %s" , mapi_strerror (err));
441+ if (b_bounce_delivered)
442+ return delivery_status::bounce_sent;
444443 return delivery_status::ok;
445444} catch (const std::bad_alloc &) {
446445 mlog (LV_ERR, " E-1472: ENOMEM" );
0 commit comments