From: Phil Pennock Date: Sat, 22 Jan 2011 23:40:43 +0000 (-0500) Subject: Merge branch 'master' of git://git.exim.org/exim X-Git-Tag: exim-4_74_RC2^2~4 X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/fa309239620364ef0f161ba6fa2ed67f372ab510?hp=0b4f0dad5075fa5a76dde9b677982fa565731b51 Merge branch 'master' of git://git.exim.org/exim --- diff --git a/src/src/dcc.c b/src/src/dcc.c index ff760bcf6..6de5102d0 100644 --- a/src/src/dcc.c +++ b/src/src/dcc.c @@ -512,7 +512,8 @@ int dcc_process(uschar **listptr) { debug_printf("Before returning to exim main process:\nreturn_text = %s - retval = %d\ndcc_result = %s\n", dcc_return_text, retval, dcc_result); (void)fclose(data_file); - return retval; + dcc_rc = retval; + return dcc_rc; } #endif diff --git a/src/src/receive.c b/src/src/receive.c index c4fb31ea7..914b1d281 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1101,6 +1101,9 @@ if (mbox_file == NULL) { "acl_smtp_mime: error while creating mbox spool file, message temporarily rejected."); Uunlink(spool_name); unspool_mbox(); +#ifdef EXPERIMENTAL_DCC + dcc_ok = 0; +#endif smtp_respond(US"451", 3, TRUE, US"temporary local problem"); message_id[0] = 0; /* Indicate no message accepted */ *smtp_reply_ptr = US""; /* Indicate reply already sent */ @@ -1180,6 +1183,9 @@ else if (rc != OK) { Uunlink(spool_name); unspool_mbox(); +#ifdef EXPERIMENTAL_DCC + dcc_ok = 0; +#endif if (smtp_handle_acl_fail(ACL_WHERE_MIME, rc, user_msg, log_msg) != 0) *smtp_yield_ptr = FALSE; /* No more messsages after dropped connection */ *smtp_reply_ptr = US""; /* Indicate reply already sent */ @@ -3091,6 +3097,9 @@ else Uunlink(spool_name); #ifdef WITH_CONTENT_SCAN unspool_mbox(); +#endif +#ifdef EXPERIMENTAL_DCC + dcc_ok = 0; #endif if (smtp_handle_acl_fail(ACL_WHERE_DATA, rc, user_msg, log_msg) != 0) smtp_yield = FALSE; /* No more messsages after dropped connection */ @@ -3130,6 +3139,9 @@ else Uunlink(spool_name); #ifdef WITH_CONTENT_SCAN unspool_mbox(); +#endif +#ifdef EXPERIMENTAL_DCC + dcc_ok = 0; #endif /* The ACL can specify where rejections are to be logged, possibly nowhere. The default is main and reject logs. */