X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/35af9f61534cba784c1718d804567043da64f2df..184e88237dea64ce48076cdd0184612d057cbafd:/src/src/transports/lmtp.c diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c index 17b0b8253..5b8472b80 100644 --- a/src/src/transports/lmtp.c +++ b/src/src/transports/lmtp.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/transports/lmtp.c,v 1.2 2004/10/14 14:52:45 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transports/lmtp.c,v 1.10 2007/01/08 10:50:20 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2007 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -28,6 +28,8 @@ optionlist lmtp_transport_options[] = { (void *)offsetof(transport_instance, batch_max) }, { "command", opt_stringptr, (void *)offsetof(lmtp_transport_options_block, cmd) }, + { "ignore_quota", opt_bool, + (void *)offsetof(lmtp_transport_options_block, ignore_quota) }, { "socket", opt_stringptr, (void *)offsetof(lmtp_transport_options_block, skt) }, { "timeout", opt_time, @@ -46,7 +48,8 @@ lmtp_transport_options_block lmtp_transport_option_defaults = { NULL, /* cmd */ NULL, /* skt */ 5*60, /* timeout */ - 0 /* options */ + 0, /* options */ + FALSE /* ignore_quota */ }; @@ -141,8 +144,8 @@ end the DATA. */ if (*errno_value == ERRNO_FILTER_FAIL) { - *message = string_sprintf("transport filter process failed (%d)%s", - more_errno, + *message = string_sprintf("transport filter process failed (%d)%s", + more_errno, (more_errno == EX_EXECFAILED)? ": unable to execute command" : ""); return FALSE; } @@ -457,6 +460,7 @@ int code, save_errno; BOOL send_data; BOOL yield = FALSE; address_item *addr; +uschar *igquotstr = US""; uschar *sockname = NULL; uschar **argv; uschar buffer[256]; @@ -561,13 +565,27 @@ if (!lmtp_write_command(fd_in, "%s %s\r\n", "LHLO", if (!lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) goto RESPONSE_FAILED; +/* If the ignore_quota option is set, note whether the server supports the +IGNOREQUOTA option, and if so, set an appropriate addition for RCPT. */ + +if (ob->ignore_quota) + igquotstr = (pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer, + Ustrlen(CS buffer), 0, PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US""; + /* Now the envelope sender */ if (!lmtp_write_command(fd_in, "MAIL FROM:<%s>\r\n", return_path)) goto WRITE_FAILED; if (!lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) + { + if (errno == 0 && buffer[0] == '4') + { + errno = ERRNO_MAIL4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } goto RESPONSE_FAILED; + } /* Next, we hand over all the recipients. Some may be permanently or temporarily rejected; others may be accepted, for now. */ @@ -575,8 +593,8 @@ temporarily rejected; others may be accepted, for now. */ send_data = FALSE; for (addr = addrlist; addr != NULL; addr = addr->next) { - if (!lmtp_write_command(fd_in, "RCPT TO:<%s>\r\n", - transport_rcpt_address(addr, tblock->rcpt_include_affixes))) + if (!lmtp_write_command(fd_in, "RCPT TO:<%s>%s\r\n", + transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr)) goto WRITE_FAILED; if (lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) { @@ -588,11 +606,11 @@ for (addr = addrlist; addr != NULL; addr = addr->next) if (errno != 0 || buffer[0] == 0) goto RESPONSE_FAILED; addr->message = string_sprintf("LMTP error after %s: %s", big_buffer, string_printing(buffer)); + setflag(addr, af_pass_message); /* Allow message to go to user */ if (buffer[0] == '5') addr->transport_return = FAIL; else { - int bincode = (buffer[1] - '0')*10 + buffer[2] - '0'; addr->basic_errno = ERRNO_RCPT4XX; - addr->more_errno |= bincode << 8; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; } } } @@ -605,7 +623,14 @@ if (send_data) if (!lmtp_write_command(fd_in, "DATA\r\n")) goto WRITE_FAILED; if (!lmtp_read_response(out, buffer, sizeof(buffer), '3', timeout)) + { + if (errno == 0 && buffer[0] == '4') + { + errno = ERRNO_DATA4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } goto RESPONSE_FAILED; + } sigalrm_seen = FALSE; transport_write_timeout = timeout; @@ -665,9 +690,15 @@ if (send_data) else { + if (buffer[0] == '4') + { + addr->basic_errno = ERRNO_DATA4XX; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } addr->message = string_sprintf("LMTP error after %s: %s", big_buffer, string_printing(buffer)); addr->transport_return = (buffer[0] == '5')? FAIL : DEFER; + setflag(addr, af_pass_message); /* Allow message to go to user */ } } } @@ -685,13 +716,15 @@ goto RETURN; /* Come here if any call to read_response, other than a response after the data phase, failed. Put the error in the top address - this will be replicated -because the yield is still FALSE. Analyse the error, and if if isn't too bad, -send a QUIT command. Wait for the response with a short timeout, so we don't -wind up this process before the far end has had time to read the QUIT. */ +because the yield is still FALSE. (But omit ETIMEDOUT, as there will already be +a suitable message.) Analyse the error, and if if isn't too bad, send a QUIT +command. Wait for the response with a short timeout, so we don't wind up this +process before the far end has had time to read the QUIT. */ RESPONSE_FAILED: save_errno = errno; +if (errno != ETIMEDOUT && errno != 0) addrlist->basic_errno = errno; addrlist->message = NULL; if (check_response(&save_errno, addrlist->more_errno, @@ -740,8 +773,8 @@ RETURN: (void)child_close(pid, timeout); -if (fd_in >= 0) (void) close(fd_in); -if (fd_out >= 0) (void) fclose(out); +if (fd_in >= 0) (void)close(fd_in); +if (fd_out >= 0) (void)fclose(out); DEBUG(D_transport) debug_printf("%s transport yields %d\n", tblock->name, yield);