X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/83364d30f60965fc809f0340cb5cab5f17b6b1c9..0d0e445543703d3294a16a17a4606c9eade7afcb:/src/src/transports/smtp.c diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index edcdc409d..c571d874c 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/transports/smtp.c,v 1.8 2005/03/22 15:45:35 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" @@ -21,10 +19,14 @@ before the lower case letters). Some live in the transport_instance block so as to be publicly visible; these are flagged with opt_public. */ optionlist smtp_transport_options[] = { + { "address_retry_include_sender", opt_bool, + (void *)offsetof(smtp_transport_options_block, address_retry_include_sender) }, { "allow_localhost", opt_bool, (void *)offsetof(smtp_transport_options_block, allow_localhost) }, { "authenticated_sender", opt_stringptr, (void *)offsetof(smtp_transport_options_block, authenticated_sender) }, + { "authenticated_sender_force", opt_bool, + (void *)offsetof(smtp_transport_options_block, authenticated_sender_force) }, { "command_timeout", opt_time, (void *)offsetof(smtp_transport_options_block, command_timeout) }, { "connect_timeout", opt_time, @@ -35,19 +37,19 @@ optionlist smtp_transport_options[] = { (void *)offsetof(smtp_transport_options_block, data_timeout) }, { "delay_after_cutoff", opt_bool, (void *)offsetof(smtp_transport_options_block, delay_after_cutoff) }, -#ifdef EXPERIMENTAL_DOMAINKEYS - { "dk_canon", opt_stringptr, - (void *)offsetof(smtp_transport_options_block, dk_canon) }, - { "dk_domain", opt_stringptr, - (void *)offsetof(smtp_transport_options_block, dk_domain) }, - { "dk_headers", opt_stringptr, - (void *)offsetof(smtp_transport_options_block, dk_headers) }, - { "dk_private_key", opt_stringptr, - (void *)offsetof(smtp_transport_options_block, dk_private_key) }, - { "dk_selector", opt_stringptr, - (void *)offsetof(smtp_transport_options_block, dk_selector) }, - { "dk_strict", opt_stringptr, - (void *)offsetof(smtp_transport_options_block, dk_strict) }, +#ifndef DISABLE_DKIM + { "dkim_canon", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dkim_canon) }, + { "dkim_domain", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dkim_domain) }, + { "dkim_private_key", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dkim_private_key) }, + { "dkim_selector", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dkim_selector) }, + { "dkim_sign_headers", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dkim_sign_headers) }, + { "dkim_strict", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dkim_strict) }, #endif { "dns_qualify_single", opt_bool, (void *)offsetof(smtp_transport_options_block, dns_qualify_single) }, @@ -59,40 +61,52 @@ optionlist smtp_transport_options[] = { (void *)offsetof(smtp_transport_options_block, final_timeout) }, { "gethostbyname", opt_bool, (void *)offsetof(smtp_transport_options_block, gethostbyname) }, +#ifdef SUPPORT_TLS + { "gnutls_require_kx", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, gnutls_require_kx) }, + { "gnutls_require_mac", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, gnutls_require_mac) }, + { "gnutls_require_protocols", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, gnutls_require_proto) }, +#endif { "helo_data", opt_stringptr, (void *)offsetof(smtp_transport_options_block, helo_data) }, { "hosts", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts) }, { "hosts_avoid_esmtp", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts_avoid_esmtp) }, - #ifdef SUPPORT_TLS + { "hosts_avoid_pipelining", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, hosts_avoid_pipelining) }, +#ifdef SUPPORT_TLS { "hosts_avoid_tls", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts_avoid_tls) }, - #endif +#endif { "hosts_max_try", opt_int, (void *)offsetof(smtp_transport_options_block, hosts_max_try) }, { "hosts_max_try_hardlimit", opt_int, (void *)offsetof(smtp_transport_options_block, hosts_max_try_hardlimit) }, - #ifdef SUPPORT_TLS +#ifdef SUPPORT_TLS { "hosts_nopass_tls", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts_nopass_tls) }, - #endif +#endif { "hosts_override", opt_bool, (void *)offsetof(smtp_transport_options_block, hosts_override) }, { "hosts_randomize", opt_bool, (void *)offsetof(smtp_transport_options_block, hosts_randomize) }, { "hosts_require_auth", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts_require_auth) }, - #ifdef SUPPORT_TLS +#ifdef SUPPORT_TLS { "hosts_require_tls", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts_require_tls) }, - #endif +#endif { "hosts_try_auth", opt_stringptr, (void *)offsetof(smtp_transport_options_block, hosts_try_auth) }, { "interface", opt_stringptr, (void *)offsetof(smtp_transport_options_block, interface) }, { "keepalive", opt_bool, (void *)offsetof(smtp_transport_options_block, keepalive) }, + { "lmtp_ignore_quota", opt_bool, + (void *)offsetof(smtp_transport_options_block, lmtp_ignore_quota) }, { "max_rcpt", opt_int | opt_public, (void *)offsetof(transport_instance, max_addresses) }, { "multi_domain", opt_bool | opt_public, @@ -107,7 +121,7 @@ optionlist smtp_transport_options[] = { (void *)offsetof(smtp_transport_options_block, serialize_hosts) }, { "size_addition", opt_int, (void *)offsetof(smtp_transport_options_block, size_addition) } - #ifdef SUPPORT_TLS +#ifdef SUPPORT_TLS ,{ "tls_certificate", opt_stringptr, (void *)offsetof(smtp_transport_options_block, tls_certificate) }, { "tls_crl", opt_stringptr, @@ -120,7 +134,7 @@ optionlist smtp_transport_options[] = { (void *)offsetof(smtp_transport_options_block, tls_tempfail_tryclear) }, { "tls_verify_certificates", opt_stringptr, (void *)offsetof(smtp_transport_options_block, tls_verify_certificates) } - #endif +#endif }; /* Size of the options list. An extern variable has to be used so that its @@ -146,6 +160,7 @@ smtp_transport_options_block smtp_transport_option_defaults = { NULL, /* hosts_require_auth */ NULL, /* hosts_require_tls */ NULL, /* hosts_avoid_tls */ + NULL, /* hosts_avoid_pipelining */ NULL, /* hosts_avoid_esmtp */ NULL, /* hosts_nopass_tls */ 5*60, /* command_timeout */ @@ -155,7 +170,9 @@ smtp_transport_options_block smtp_transport_option_defaults = { 1024, /* size_addition */ 5, /* hosts_max_try */ 50, /* hosts_max_try_hardlimit */ + TRUE, /* address_retry_include_sender */ FALSE, /* allow_localhost */ + FALSE, /* authenticated_sender_force */ FALSE, /* gethostbyname */ TRUE, /* dns_qualify_single */ FALSE, /* dns_search_parents */ @@ -163,23 +180,27 @@ smtp_transport_options_block smtp_transport_option_defaults = { FALSE, /* hosts_override */ FALSE, /* hosts_randomize */ TRUE, /* keepalive */ + FALSE, /* lmtp_ignore_quota */ TRUE /* retry_include_ip_address */ - #ifdef SUPPORT_TLS +#ifdef SUPPORT_TLS ,NULL, /* tls_certificate */ NULL, /* tls_crl */ NULL, /* tls_privatekey */ NULL, /* tls_require_ciphers */ + NULL, /* gnutls_require_kx */ + NULL, /* gnutls_require_mac */ + NULL, /* gnutls_require_proto */ NULL, /* tls_verify_certificates */ TRUE /* tls_tempfail_tryclear */ - #endif - #ifdef EXPERIMENTAL_DOMAINKEYS - ,NULL, /* dk_canon */ - NULL, /* dk_domain */ - NULL, /* dk_headers */ - NULL, /* dk_private_key */ - NULL, /* dk_selector */ - NULL /* dk_strict */ - #endif +#endif +#ifndef DISABLE_DKIM + ,NULL, /* dkim_canon */ + NULL, /* dkim_domain */ + NULL, /* dkim_private_key */ + NULL, /* dkim_selector */ + NULL, /* dkim_sign_headers */ + NULL /* dkim_strict */ +#endif }; @@ -187,6 +208,7 @@ smtp_transport_options_block smtp_transport_option_defaults = { static uschar *smtp_command; /* Points to last cmd for error messages */ static uschar *mail_command; /* Points to MAIL cmd for error messages */ +static BOOL update_waiting; /* TRUE to update the "wait" database */ /************************************************* @@ -197,13 +219,15 @@ static uschar *mail_command; /* Points to MAIL cmd for error messages */ but before running it in a sub-process. It is used for two things: (1) To set the fallback host list in addresses, when delivering. - (2) To pass back the interface, port, and protocol options, for use during - callout verification. + (2) To pass back the interface, port, protocol, and other options, for use + during callout verification. Arguments: tblock pointer to the transport instance block addrlist list of addresses about to be transported tf if not NULL, pointer to block in which to return options + uid the uid that will be set (not used) + gid the gid that will be set (not used) errmsg place for error message (not used) Returns: OK always (FAIL, DEFER not used) @@ -211,12 +235,14 @@ Returns: OK always (FAIL, DEFER not used) static int smtp_transport_setup(transport_instance *tblock, address_item *addrlist, - transport_feedback *tf, uschar **errmsg) + transport_feedback *tf, uid_t uid, gid_t gid, uschar **errmsg) { smtp_transport_options_block *ob = (smtp_transport_options_block *)(tblock->options_block); errmsg = errmsg; /* Keep picky compilers happy */ +uid = uid; +gid = gid; /* Pass back options if required. This interface is getting very messy. */ @@ -231,6 +257,7 @@ if (tf != NULL) tf->gethostbyname = ob->gethostbyname; tf->qualify_single = ob->dns_qualify_single; tf->search_parents = ob->dns_search_parents; + tf->helo_data = ob->helo_data; } /* Set the fallback host list for all the addresses that don't have fallback @@ -275,7 +302,8 @@ if (tblock->retry_use_local_part == TRUE_UNSET) /* Set the default port according to the protocol */ if (ob->port == NULL) - ob->port = (strcmpic(ob->protocol, US"lmtp") == 0)? US"lmtp" : US"smtp"; + ob->port = (strcmpic(ob->protocol, US"lmtp") == 0)? US"lmtp" : + (strcmpic(ob->protocol, US"smtps") == 0)? US"smtps" : US"smtp"; /* Set up the setup entry point, to be called before subprocesses for this transport. */ @@ -313,10 +341,11 @@ host_build_hostlist(&(ob->fallback_hostlist), ob->fallback_hosts, FALSE); status means that an address is not currently being processed. Arguments: - addrlist points to a chain of addresses - errno_value to put in each address's errno field - msg to put in each address's message field - rc to put in each address's transport_return field + addrlist points to a chain of addresses + errno_value to put in each address's errno field + msg to put in each address's message field + rc to put in each address's transport_return field + pass_message if TRUE, set the "pass message" flag in the address If errno_value has the special value ERRNO_CONNECTTIMEOUT, ETIMEDOUT is put in the errno field, and RTEF_CTOUT is ORed into the more_errno field, to indicate @@ -325,8 +354,9 @@ this particular type of timeout. Returns: nothing */ -static -void set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc) +static void +set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc, + BOOL pass_message) { address_item *addr; int orvalue = 0; @@ -340,7 +370,11 @@ for (addr = addrlist; addr != NULL; addr = addr->next) if (addr->transport_return < PENDING) continue; addr->basic_errno = errno_value; addr->more_errno |= orvalue; - if (msg != NULL) addr->message = msg; + if (msg != NULL) + { + addr->message = msg; + if (pass_message) setflag(addr, af_pass_message); + } addr->transport_return = rc; } } @@ -358,18 +392,19 @@ the yield variable. If no response was actually read, a suitable digit is chosen. Arguments: - host the current host, to get its name for messages - errno_value pointer to the errno value - more_errno from the top address for use with ERRNO_FILTER_FAIL - buffer the SMTP response buffer - yield where to put a one-digit SMTP response code - message where to put an errror message - -Returns: TRUE if an SMTP "QUIT" command should be sent, else FALSE + host the current host, to get its name for messages + errno_value pointer to the errno value + more_errno from the top address for use with ERRNO_FILTER_FAIL + buffer the SMTP response buffer + yield where to put a one-digit SMTP response code + message where to put an errror message + pass_message set TRUE if message is an SMTP response + +Returns: TRUE if an SMTP "QUIT" command should be sent, else FALSE */ static BOOL check_response(host_item *host, int *errno_value, int more_errno, - uschar *buffer, int *yield, uschar **message) + uschar *buffer, int *yield, uschar **message, BOOL *pass_message) { uschar *pl = US""; @@ -444,18 +479,20 @@ if (*errno_value == ERRNO_WRITEINCOMPLETE) if (buffer[0] != 0) { uschar *s = string_printing(buffer); - *message = US string_sprintf("SMTP error from remote mailer after %s%s: " + *message = US string_sprintf("SMTP error from remote mail server after %s%s: " "host %s [%s]: %s", pl, smtp_command, host->name, host->address, s); + *pass_message = TRUE; *yield = buffer[0]; return TRUE; } /* No data was read. If there is no errno, this must be the EOF (i.e. -connection closed) case, which causes deferral. Otherwise, put the host's -identity in the message, leaving the errno value to be interpreted as well. In -all cases, we have to assume the connection is now dead. */ +connection closed) case, which causes deferral. An explicit connection reset +error has the same effect. Otherwise, put the host's identity in the message, +leaving the errno value to be interpreted as well. In all cases, we have to +assume the connection is now dead. */ -if (*errno_value == 0) +if (*errno_value == 0 || *errno_value == ECONNRESET) { *errno_value = ERRNO_SMTPCLOSED; *message = US string_sprintf("Remote host %s [%s] closed connection " @@ -494,14 +531,14 @@ if (addr->message != NULL) } else { - log_write(0, LOG_MAIN, "%s [%s]: %s", - host->name, - host->address, - strerror(addr->basic_errno)); - deliver_msglog("%s %s [%s]: %s\n", - tod_stamp(tod_log), - host->name, - host->address, + uschar *msg = + ((log_extra_selector & LX_outgoing_port) != 0)? + string_sprintf("%s [%s]:%d", host->name, host->address, + (host->port == PORT_NONE)? 25 : host->port) + : + string_sprintf("%s [%s]", host->name, host->address); + log_write(0, LOG_MAIN, "%s %s", msg, strerror(addr->basic_errno)); + deliver_msglog("%s %s %s\n", tod_stamp(tod_log), msg, strerror(addr->basic_errno)); } } @@ -534,19 +571,21 @@ subsequent general error, it will get reset accordingly. If not, it will get converted to OK at the end. Arguments: - addrlist the complete address list - include_affixes TRUE if affixes include in RCPT - sync_addr ptr to the ptr of the one to start scanning at (updated) - host the host we are connected to - count the number of responses to read - pending_MAIL true if the first response is for MAIL - pending_DATA 0 if last command sent was not DATA - +1 if previously had a good recipient - -1 if not previously had a good recipient - inblock incoming SMTP block - timeout timeout value - buffer buffer for reading response - buffsize size of buffer + addrlist the complete address list + include_affixes TRUE if affixes include in RCPT + sync_addr ptr to the ptr of the one to start scanning at (updated) + host the host we are connected to + count the number of responses to read + address_retry_ + include_sender true if 4xx retry is to include the sender it its key + pending_MAIL true if the first response is for MAIL + pending_DATA 0 if last command sent was not DATA + +1 if previously had a good recipient + -1 if not previously had a good recipient + inblock incoming SMTP block + timeout timeout value + buffer buffer for reading response + buffsize size of buffer Returns: 3 if at least one address had 2xx and one had 5xx 2 if at least one address had 5xx but none had 2xx @@ -559,7 +598,8 @@ Returns: 3 if at least one address had 2xx and one had 5xx static int sync_responses(address_item *addrlist, BOOL include_affixes, - address_item **sync_addr, host_item *host, int count, BOOL pending_MAIL, + address_item **sync_addr, host_item *host, int count, + BOOL address_retry_include_sender, BOOL pending_MAIL, int pending_DATA, smtp_inblock *inblock, int timeout, uschar *buffer, int buffsize) { @@ -579,6 +619,12 @@ if (pending_MAIL) if (errno == 0 && buffer[0] != 0) { uschar flushbuffer[4096]; + int save_errno = 0; + if (buffer[0] == '4') + { + save_errno = ERRNO_MAIL4XX; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } while (count-- > 0) { if (!smtp_read_response(inblock, flushbuffer, sizeof(flushbuffer), @@ -586,6 +632,7 @@ if (pending_MAIL) && (errno != 0 || flushbuffer[0] == 0)) break; } + errno = save_errno; } return -3; } @@ -609,10 +656,16 @@ while (count-- > 0) addr->transport_return = PENDING_OK; /* If af_dr_retry_exists is set, there was a routing delay on this address; - ensure that any address-specific retry record is expunged. */ + ensure that any address-specific retry record is expunged. We do this both + for the basic key and for the version that also includes the sender. */ if (testflag(addr, af_dr_retry_exists)) + { + uschar *altkey = string_sprintf("%s:<%s>", addr->address_retry_key, + sender_address); + retry_add_item(addr, altkey, rf_delete); retry_add_item(addr, addr->address_retry_key, rf_delete); + } } /* Timeout while reading the response */ @@ -623,9 +676,9 @@ while (count-- > 0) uschar *message = string_sprintf("SMTP timeout while connected to %s [%s] " "after RCPT TO:<%s>", host->name, host->address, transport_rcpt_address(addr, include_affixes)); - set_errno(addrlist, save_errno, message, DEFER); + set_errno(addrlist, save_errno, message, DEFER, FALSE); retry_add_item(addr, addr->address_retry_key, 0); - host->update_waiting = FALSE; + update_waiting = FALSE; return -1; } @@ -646,9 +699,10 @@ while (count-- > 0) else { addr->message = - string_sprintf("SMTP error from remote mailer after RCPT TO:<%s>: " + string_sprintf("SMTP error from remote mail server after RCPT TO:<%s>: " "host %s [%s]: %s", transport_rcpt_address(addr, include_affixes), host->name, host->address, string_printing(buffer)); + setflag(addr, af_pass_message); deliver_msglog("%s %s\n", tod_stamp(tod_log), addr->message); /* The response was 5xx */ @@ -663,25 +717,30 @@ while (count-- > 0) else { - int bincode = (buffer[1] - '0')*10 + buffer[2] - '0'; - addr->transport_return = DEFER; addr->basic_errno = ERRNO_RCPT4XX; - addr->more_errno |= bincode << 8; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; /* Log temporary errors if there are more hosts to be tried. */ if (host->next != NULL) log_write(0, LOG_MAIN, "%s", addr->message); - /* Do not put this message on the list of those waiting for this host, - as otherwise it is likely to be tried too often. */ + /* Do not put this message on the list of those waiting for specific + hosts, as otherwise it is likely to be tried too often. */ - host->update_waiting = FALSE; + update_waiting = FALSE; - /* Add a retry item for the address so that it doesn't get tried - again too soon. */ + /* Add a retry item for the address so that it doesn't get tried again + too soon. If address_retry_include_sender is true, add the sender address + to the retry key. */ - retry_add_item(addr, addr->address_retry_key, 0); + if (address_retry_include_sender) + { + uschar *altkey = string_sprintf("%s:<%s>", addr->address_retry_key, + sender_address); + retry_add_item(addr, altkey, 0); + } + else retry_add_item(addr, addr->address_retry_key, 0); } } } /* Loop for next RCPT response */ @@ -699,8 +758,17 @@ if (pending_DATA != 0 && { int code; uschar *msg; - if (pending_DATA > 0 || (yield & 1) != 0) return -3; - (void)check_response(host, &errno, 0, buffer, &code, &msg); + BOOL pass_message; + if (pending_DATA > 0 || (yield & 1) != 0) + { + if (errno == 0 && buffer[0] == '4') + { + errno = ERRNO_DATA4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } + return -3; + } + (void)check_response(host, &errno, 0, buffer, &code, &msg, &pass_message); DEBUG(D_transport) debug_printf("%s\nerror for DATA ignored: pipelining " "is in use and there were no good recipients\n", msg); } @@ -720,7 +788,8 @@ return yield; /* If continue_hostname is not null, we get here only when continuing to deliver down an existing channel. The channel was passed as the standard -input. +input. TLS is never active on a passed channel; the previous process always +closes it down before passing the connection on. Otherwise, we have to make a connection to the remote host, and do the initial protocol exchange. @@ -736,7 +805,7 @@ Arguments: failed by one of them. host host to deliver to host_af AF_INET or AF_INET6 - port TCP/IP port to use, in host byte order + port default TCP/IP port to use, in host byte order interface interface to bind to, or NULL tblock transport instance block copy_host TRUE if host set in addr->host_used must be copied, because @@ -775,6 +844,7 @@ time_t start_delivery_time = time(NULL); smtp_transport_options_block *ob = (smtp_transport_options_block *)(tblock->options_block); BOOL lmtp = strcmpic(ob->protocol, US"lmtp") == 0; +BOOL smtps = strcmpic(ob->protocol, US"smtps") == 0; BOOL ok = FALSE; BOOL send_rset = TRUE; BOOL send_quit = TRUE; @@ -782,11 +852,13 @@ BOOL setting_up = TRUE; BOOL completed_address = FALSE; BOOL esmtp = TRUE; BOOL pending_MAIL; +BOOL pass_message = FALSE; smtp_inblock inblock; smtp_outblock outblock; int max_rcpt = tblock->max_addresses; +uschar *igquotstr = US""; uschar *local_authenticated_sender = authenticated_sender; -uschar *helo_data; +uschar *helo_data = NULL; uschar *message = NULL; uschar new_message_id[MESSAGE_ID_LENGTH + 1]; uschar *p; @@ -815,16 +887,10 @@ outblock.ptr = outbuffer; outblock.cmd_count = 0; outblock.authenticating = FALSE; -/* Expand the greeting message */ +/* Reset the parameters of a TLS session. */ -helo_data = expand_string(ob->helo_data); -if (helo_data == NULL) - { - uschar *message = string_sprintf("failed to expand helo_data: %s", - expand_string_message); - set_errno(addrlist, 0, message, DEFER); - return ERROR; - } +tls_cipher = NULL; +tls_peerdn = NULL; /* If an authenticated_sender override has been specified for this transport instance, expand it. If the expansion is forced to fail, and there was already @@ -842,13 +908,21 @@ if (ob->authenticated_sender != NULL) { uschar *message = string_sprintf("failed to expand " "authenticated_sender: %s", expand_string_message); - set_errno(addrlist, 0, message, DEFER); + set_errno(addrlist, 0, message, DEFER, FALSE); return ERROR; } } else if (new[0] != 0) local_authenticated_sender = new; } +#ifndef SUPPORT_TLS +if (smtps) + { + set_errno(addrlist, 0, US"TLS support not available", DEFER, FALSE); + return ERROR; + } +#endif + /* Make a connection to the host if this isn't a continued delivery, and handle the initial interaction and HELO/EHLO/LHLO. Connect timeout errors are handled specially so they can be identified for retries. */ @@ -857,20 +931,42 @@ if (continue_hostname == NULL) { inblock.sock = outblock.sock = smtp_connect(host, host_af, port, interface, ob->connect_timeout, - ob->keepalive); + ob->keepalive); /* This puts port into host->port */ + if (inblock.sock < 0) { set_errno(addrlist, (errno == ETIMEDOUT)? ERRNO_CONNECTTIMEOUT : errno, - NULL, DEFER); + NULL, DEFER, FALSE); return DEFER; } + /* Expand the greeting message while waiting for the initial response. (Makes + sense if helo_data contains ${lookup dnsdb ...} stuff). The expansion is + delayed till here so that $sending_interface and $sending_port are set. */ + + helo_data = expand_string(ob->helo_data); + /* The first thing is to wait for an initial OK response. The dreaded "goto" is nevertheless a reasonably clean way of programming this kind of logic, where you want to escape on any error. */ - if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2', - ob->command_timeout)) goto RESPONSE_FAILED; + if (!smtps) + { + if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2', + ob->command_timeout)) goto RESPONSE_FAILED; + + /* Now check if the helo_data expansion went well, and sign off cleanly if + it didn't. */ + + if (helo_data == NULL) + { + uschar *message = string_sprintf("failed to expand helo_data: %s", + expand_string_message); + set_errno(addrlist, 0, message, DEFER, FALSE); + yield = DEFER; + goto SEND_QUIT; + } + } /** Debugging without sending a message addrlist->transport_return = DEFER; @@ -910,6 +1006,20 @@ goto SEND_QUIT; esmtp = verify_check_this_host(&(ob->hosts_avoid_esmtp), NULL, host->name, host->address, NULL) != OK; + /* Alas; be careful, since this goto is not an error-out, so conceivably + we might set data between here and the target which we assume to exist + and be usable. I can see this coming back to bite us. */ + #ifdef SUPPORT_TLS + if (smtps) + { + tls_offered = TRUE; + suppress_tls = FALSE; + ob->tls_tempfail_tryclear = FALSE; + smtp_command = US"SSL-on-connect"; + goto TLS_NEGOTIATE; + } + #endif + if (esmtp) { if (smtp_write_command(&outblock, FALSE, "%s %s\r\n", @@ -936,6 +1046,13 @@ goto SEND_QUIT; ob->command_timeout)) goto RESPONSE_FAILED; } + /* Set IGNOREQUOTA if the response to LHLO specifies support and the + lmtp_ignore_quota option was set. */ + + igquotstr = (lmtp && ob->lmtp_ignore_quota && + pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer, Ustrlen(CS buffer), 0, + PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US""; + /* Set tls_offered if the response to EHLO specifies support for STARTTLS. */ #ifdef SUPPORT_TLS @@ -956,6 +1073,7 @@ else { inblock.sock = outblock.sock = fileno(stdin); smtp_command = big_buffer; + host->port = port; /* Record the port that was used */ } /* If TLS is available on this connection, whether continued or not, attempt to @@ -985,23 +1103,31 @@ if (tls_offered && !suppress_tls && if (!smtp_read_response(&inblock, buffer2, sizeof(buffer2), '2', ob->command_timeout)) { - Ustrncpy(buffer, buffer2, sizeof(buffer)); if (errno != 0 || buffer2[0] == 0 || (buffer2[0] == '4' && !ob->tls_tempfail_tryclear)) + { + Ustrncpy(buffer, buffer2, sizeof(buffer)); goto RESPONSE_FAILED; + } } /* STARTTLS accepted: try to negotiate a TLS session. */ else + TLS_NEGOTIATE: { - int rc = tls_client_start(inblock.sock, host, addrlist, + int rc = tls_client_start(inblock.sock, + host, + addrlist, NULL, /* No DH param */ ob->tls_certificate, ob->tls_privatekey, ob->tls_verify_certificates, ob->tls_crl, ob->tls_require_ciphers, + ob->gnutls_require_mac, + ob->gnutls_require_kx, + ob->gnutls_require_proto, ob->command_timeout); /* TLS negotiation failed; give an error. From outside, this function may @@ -1020,18 +1146,59 @@ if (tls_offered && !suppress_tls && for (addr = addrlist; addr != NULL; addr = addr->next) { - addr->cipher = tls_cipher; - addr->peerdn = tls_peerdn; + if (addr->transport_return == PENDING_DEFER) + { + addr->cipher = tls_cipher; + addr->peerdn = tls_peerdn; + } } } } -/* If we started TLS, redo the EHLO/LHLO exchange over the secure channel. */ +/* if smtps, we'll have smtp_command set to something else; always safe to +reset it here. */ +smtp_command = big_buffer; + +/* If we started TLS, redo the EHLO/LHLO exchange over the secure channel. If +helo_data is null, we are dealing with a connection that was passed from +another process, and so we won't have expanded helo_data above. We have to +expand it here. $sending_ip_address and $sending_port are set up right at the +start of the Exim process (in exim.c). */ if (tls_active >= 0) { - if (smtp_write_command(&outblock, FALSE, "%s %s\r\n", lmtp? "LHLO" : "EHLO", - helo_data) < 0) + char *greeting_cmd; + if (helo_data == NULL) + { + helo_data = expand_string(ob->helo_data); + if (helo_data == NULL) + { + uschar *message = string_sprintf("failed to expand helo_data: %s", + expand_string_message); + set_errno(addrlist, 0, message, DEFER, FALSE); + yield = DEFER; + goto SEND_QUIT; + } + } + + /* For SMTPS we need to wait for the initial OK response. */ + if (smtps) + { + if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2', + ob->command_timeout)) goto RESPONSE_FAILED; + } + + if (esmtp) + greeting_cmd = "EHLO"; + else + { + greeting_cmd = "HELO"; + DEBUG(D_transport) + debug_printf("not sending EHLO (host matches hosts_avoid_esmtp)\n"); + } + + if (smtp_write_command(&outblock, FALSE, "%s %s\r\n", + lmtp? "LHLO" : greeting_cmd, helo_data) < 0) goto SEND_FAILED; if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2', ob->command_timeout)) @@ -1067,6 +1234,13 @@ if (continue_hostname == NULL int require_auth; uschar *fail_reason = US"server did not advertise AUTH support"; + /* Set for IGNOREQUOTA if the response to LHLO specifies support and the + lmtp_ignore_quota option was set. */ + + igquotstr = (lmtp && ob->lmtp_ignore_quota && + pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer, Ustrlen(CS buffer), 0, + PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US""; + /* If the response to EHLO specified support for the SIZE parameter, note this, provided size_addition is non-negative. */ @@ -1075,9 +1249,12 @@ if (continue_hostname == NULL PCRE_EOPT, NULL, 0) >= 0; /* Note whether the server supports PIPELINING. If hosts_avoid_esmtp matched - the current host, esmtp will be false, so PIPELINING can never be used. */ + the current host, esmtp will be false, so PIPELINING can never be used. If + the current host matches hosts_avoid_pipelining, don't do it. */ smtp_use_pipelining = esmtp && + verify_check_this_host(&(ob->hosts_avoid_pipelining), NULL, host->name, + host->address, NULL) != OK && pcre_exec(regex_PIPELINING, NULL, CS buffer, Ustrlen(CS buffer), 0, PCRE_EOPT, NULL, 0) >= 0; @@ -1111,14 +1288,25 @@ if (continue_hostname == NULL DEBUG(D_transport) debug_printf("scanning authentication mechanisms\n"); /* Scan the configured authenticators looking for one which is configured - for use as a client and whose name matches an authentication mechanism - supported by the server. If one is found, attempt to authenticate by - calling its client function. */ + for use as a client, which is not suppressed by client_condition, and + whose name matches an authentication mechanism supported by the server. + If one is found, attempt to authenticate by calling its client function. + */ for (au = auths; !smtp_authenticated && au != NULL; au = au->next) { uschar *p = names; - if (!au->client) continue; + if (!au->client || + (au->client_condition != NULL && + !expand_check_condition(au->client_condition, au->name, + US"client authenticator"))) + { + DEBUG(D_transport) debug_printf("skipping %s authenticator: %s\n", + au->name, + (au->client)? "client_condition is false" : + "not configured as a client"); + continue; + } /* Loop to scan supported server mechanisms */ @@ -1174,16 +1362,21 @@ if (continue_hostname == NULL /* Failure by some other means. In effect, the authenticator decided it wasn't prepared to handle this case. Typically this is the result of "fail" in an expansion string. Do we need to - log anything here? */ + log anything here? Feb 2006: a message is now put in the buffer + if logging is required. */ case CANCELLED: + if (*buffer != 0) + log_write(0, LOG_MAIN, "%s authenticator cancelled " + "authentication H=%s [%s] %s", au->name, host->name, + host->address, buffer); break; /* Internal problem, message in buffer. */ case ERROR: yield = ERROR; - set_errno(addrlist, 0, string_copy(buffer), DEFER); + set_errno(addrlist, 0, string_copy(buffer), DEFER, FALSE); goto SEND_QUIT; } @@ -1199,7 +1392,8 @@ if (continue_hostname == NULL { yield = DEFER; set_errno(addrlist, ERRNO_AUTHFAIL, - string_sprintf("authentication required but %s", fail_reason), DEFER); + string_sprintf("authentication required but %s", fail_reason), DEFER, + FALSE); goto SEND_QUIT; } } @@ -1219,13 +1413,15 @@ if (tblock->filter_command != NULL) sprintf(CS buffer, "%.50s transport", tblock->name); rc = transport_set_up_command(&transport_filter_argv, tblock->filter_command, TRUE, DEFER, addrlist, buffer, NULL); + transport_filter_timeout = tblock->filter_timeout; /* On failure, copy the error to all addresses, abandon the SMTP call, and yield ERROR. */ if (!rc) { - set_errno(addrlist->next, addrlist->basic_errno, addrlist->message, DEFER); + set_errno(addrlist->next, addrlist->basic_errno, addrlist->message, DEFER, + FALSE); yield = ERROR; goto SEND_QUIT; } @@ -1266,7 +1462,8 @@ if (smtp_use_size) /* Add the authenticated sender address if present */ -if (smtp_authenticated && local_authenticated_sender != NULL) +if ((smtp_authenticated || ob->authenticated_sender_force) && + local_authenticated_sender != NULL) { string_format(p, sizeof(buffer) - (p-buffer), " AUTH=%s", auth_xtextencode(local_authenticated_sender, @@ -1292,7 +1489,15 @@ switch(rc) case +1: /* Block was sent */ if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2', - ob->command_timeout)) goto RESPONSE_FAILED; + ob->command_timeout)) + { + if (errno == 0 && buffer[0] == '4') + { + errno = ERRNO_MAIL4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } + goto RESPONSE_FAILED; + } pending_MAIL = FALSE; break; } @@ -1327,14 +1532,15 @@ for (addr = first_addr; yield as OK, because this error can often mean that there is a problem with just one address, so we don't want to delay the host. */ - count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>\r\n", - transport_rcpt_address(addr, tblock->rcpt_include_affixes)); + count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>%s\r\n", + transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr); if (count < 0) goto SEND_FAILED; if (count > 0) { switch(sync_responses(first_addr, tblock->rcpt_include_affixes, - &sync_addr, host, count, pending_MAIL, 0, &inblock, - ob->command_timeout, buffer, sizeof(buffer))) + &sync_addr, host, count, ob->address_retry_include_sender, + pending_MAIL, 0, &inblock, ob->command_timeout, buffer, + sizeof(buffer))) { case 3: ok = TRUE; /* 2xx & 5xx => OK & progress made */ case 2: completed_address = TRUE; /* 5xx (only) => progress made */ @@ -1365,7 +1571,8 @@ if (mua_wrapper) } if (badaddr != NULL) { - set_errno(addrlist, 0, badaddr->message, FAIL); + set_errno(addrlist, 0, badaddr->message, FAIL, + testflag(badaddr, af_pass_message)); ok = FALSE; } } @@ -1381,8 +1588,8 @@ if (ok || (smtp_use_pipelining && !mua_wrapper)) int count = smtp_write_command(&outblock, FALSE, "DATA\r\n"); if (count < 0) goto SEND_FAILED; switch(sync_responses(first_addr, tblock->rcpt_include_affixes, &sync_addr, - host, count, pending_MAIL, ok? +1 : -1, &inblock, - ob->command_timeout, buffer, sizeof(buffer))) + host, count, ob->address_retry_include_sender, pending_MAIL, + ok? +1 : -1, &inblock, ob->command_timeout, buffer, sizeof(buffer))) { case 3: ok = TRUE; /* 2xx & 5xx => OK & progress made */ case 2: completed_address = TRUE; /* 5xx (only) => progress made */ @@ -1416,23 +1623,22 @@ if (!ok) ok = TRUE; else DEBUG(D_transport|D_v) debug_printf(" SMTP>> writing message and terminating \".\"\n"); transport_count = 0; -#ifdef EXPERIMENTAL_DOMAINKEYS - if ( (ob->dk_private_key != NULL) && (ob->dk_selector != NULL) ) - ok = dk_transport_write_message(addrlist, inblock.sock, - topt_use_crlf | topt_end_dot | topt_escape_headers | - (tblock->body_only? topt_no_headers : 0) | - (tblock->headers_only? topt_no_body : 0) | - (tblock->return_path_add? topt_add_return_path : 0) | - (tblock->delivery_date_add? topt_add_delivery_date : 0) | - (tblock->envelope_to_add? topt_add_envelope_to : 0), - 0, /* No size limit */ - tblock->add_headers, tblock->remove_headers, - US".", US"..", /* Escaping strings */ - tblock->rewrite_rules, tblock->rewrite_existflags, - ob->dk_private_key, ob->dk_domain, ob->dk_selector, - ob->dk_canon, ob->dk_headers, ob->dk_strict); - else -#endif +#ifndef DISABLE_DKIM + ok = dkim_transport_write_message(addrlist, inblock.sock, + topt_use_crlf | topt_end_dot | topt_escape_headers | + (tblock->body_only? topt_no_headers : 0) | + (tblock->headers_only? topt_no_body : 0) | + (tblock->return_path_add? topt_add_return_path : 0) | + (tblock->delivery_date_add? topt_add_delivery_date : 0) | + (tblock->envelope_to_add? topt_add_envelope_to : 0), + 0, /* No size limit */ + tblock->add_headers, tblock->remove_headers, + US".", US"..", /* Escaping strings */ + tblock->rewrite_rules, tblock->rewrite_existflags, + ob->dkim_private_key, ob->dkim_domain, ob->dkim_selector, + ob->dkim_canon, ob->dkim_strict, ob->dkim_sign_headers + ); +#else ok = transport_write_message(addrlist, inblock.sock, topt_use_crlf | topt_end_dot | topt_escape_headers | (tblock->body_only? topt_no_headers : 0) | @@ -1444,6 +1650,7 @@ if (!ok) ok = TRUE; else tblock->add_headers, tblock->remove_headers, US".", US"..", /* Escaping strings */ tblock->rewrite_rules, tblock->rewrite_existflags); +#endif /* transport_write_message() uses write() because it is called from other places to write to non-sockets. This means that under some OS (e.g. Solaris) @@ -1472,8 +1679,16 @@ if (!ok) ok = TRUE; else /* For SMTP, we now read a single response that applies to the whole message. If it is OK, then all the addresses have been delivered. */ - if (!lmtp) ok = smtp_read_response(&inblock, buffer, sizeof(buffer), '2', - ob->final_timeout); + if (!lmtp) + { + ok = smtp_read_response(&inblock, buffer, sizeof(buffer), '2', + ob->final_timeout); + if (!ok && errno == 0 && buffer[0] == '4') + { + errno = ERRNO_DATA4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } + } /* For LMTP, we get back a response for every RCPT command that we sent; some may be accepted and some rejected. For those that get a response, their @@ -1525,7 +1740,8 @@ if (!ok) ok = TRUE; else /* LMTP - if the response fails badly (e.g. timeout), use it for all the remaining addresses. Otherwise, it's a return code for just the one - address. */ + address. For temporary errors, add a retry item for the address so that + it doesn't get tried again too soon. */ if (lmtp) { @@ -1535,18 +1751,31 @@ if (!ok) ok = TRUE; else if (errno != 0 || buffer[0] == 0) goto RESPONSE_FAILED; 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 */ + if (buffer[0] == '5') + addr->transport_return = FAIL; + else + { + errno = ERRNO_DATA4XX; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + addr->transport_return = DEFER; + retry_add_item(addr, addr->address_retry_key, 0); + } continue; } completed_address = TRUE; /* NOW we can set this flag */ + if ((log_extra_selector & LX_smtp_confirmation) != 0) + { + uschar *s = string_printing(buffer); + conf = (s == buffer)? (uschar *)string_copy(s) : s; + } } /* SMTP, or success return from LMTP for this address. Pass back the - actual port used. */ + actual host that was used. */ addr->transport_return = OK; addr->more_errno = delivery_time; - thost->port = port; addr->host_used = thost; addr->special_action = flag; addr->message = conf; @@ -1571,7 +1800,7 @@ if (!ok) ok = TRUE; else /* Ensure the journal file is pushed out to disk. */ - if (fsync(journal_fd) < 0) + if (EXIMfsync(journal_fd) < 0) log_write(0, LOG_MAIN|LOG_PANIC, "failed to fsync journal: %s", strerror(errno)); } @@ -1594,7 +1823,7 @@ if (!ok) save_errno = errno; message = NULL; send_quit = check_response(host, &save_errno, addrlist->more_errno, - buffer, &code, &message); + buffer, &code, &message, &pass_message); goto FAILED; SEND_FAILED: @@ -1629,69 +1858,92 @@ if (!ok) { if (code == '5') { - set_errno(addrlist, save_errno, message, FAIL); + set_errno(addrlist, save_errno, message, FAIL, pass_message); } else { - set_errno(addrlist, save_errno, message, DEFER); + set_errno(addrlist, save_errno, message, DEFER, pass_message); yield = DEFER; } } - /* If there was an I/O error or timeout or other transportation error, - indicated by errno being non-zero, defer all addresses and yield DEFER, - except for the case of failed add_headers expansion, or a transport filter - failure, when the yield should be ERROR, to stop it trying other hosts. - - However, handle timeouts after MAIL FROM or "." and loss of connection after + /* We want to handle timeouts after MAIL or "." and loss of connection after "." specially. They can indicate a problem with the sender address or with - the contents of the message rather than a real error on the connection. - Therefore, treat these cases in the same way as a 4xx response. - - The following condition tests for NOT these special cases. */ + the contents of the message rather than a real error on the connection. These + cases are treated in the same way as a 4xx response. This next bit of code + does the classification. */ - else if (save_errno != 0 && - (save_errno != ETIMEDOUT || - (Ustrncmp(smtp_command,"MAIL",4) != 0 && - Ustrncmp(smtp_command,"end ",4) != 0)) && - (save_errno != ERRNO_SMTPCLOSED || - Ustrncmp(smtp_command,"end ",4) != 0)) + else { - yield = (save_errno == ERRNO_CHHEADER_FAIL || - save_errno == ERRNO_FILTER_FAIL)? ERROR : DEFER; - set_errno(addrlist, save_errno, message, DEFER); - } + BOOL message_error; + + switch(save_errno) + { + case 0: + case ERRNO_MAIL4XX: + case ERRNO_DATA4XX: + message_error = TRUE; + break; - /* Otherwise we have a message-specific error response from the remote - host. This is one of - (a) negative response or timeout after "mail from" - (b) negative response after "data" - (c) negative response or timeout or dropped connection after "." - It won't be a negative response or timeout after "rcpt to", as that is dealt - with separately above. The action in all cases is to set an appropriate - error code for all the addresses, but to leave yield set to OK because - the host itself has not failed. [It might in practice have failed for a - timeout after MAIL FROM, or "." but if so, we'll discover that at the next - delivery attempt.] For a temporary error, set the message_defer flag, and - write to the logs for information if this is not the last host. The error for - the last host will be logged as part of the address's log line. */ + case ETIMEDOUT: + message_error = Ustrncmp(smtp_command,"MAIL",4) == 0 || + Ustrncmp(smtp_command,"end ",4) == 0; + break; - else - { - if (mua_wrapper) code = '5'; /* Force hard failure in wrapper mode */ + case ERRNO_SMTPCLOSED: + message_error = Ustrncmp(smtp_command,"end ",4) == 0; + break; + + default: + message_error = FALSE; + break; + } + + /* Handle the cases that are treated as message errors. These are: + + (a) negative response or timeout after MAIL + (b) negative response after DATA + (c) negative response or timeout or dropped connection after "." + + It won't be a negative response or timeout after RCPT, as that is dealt + with separately above. The action in all cases is to set an appropriate + error code for all the addresses, but to leave yield set to OK because the + host itself has not failed. Of course, it might in practice have failed + when we've had a timeout, but if so, we'll discover that at the next + delivery attempt. For a temporary error, set the message_defer flag, and + write to the logs for information if this is not the last host. The error + for the last host will be logged as part of the address's log line. */ + + if (message_error) + { + if (mua_wrapper) code = '5'; /* Force hard failure in wrapper mode */ + set_errno(addrlist, save_errno, message, (code == '5')? FAIL : DEFER, + pass_message); + + /* If there's an errno, the message contains just the identity of + the host. */ - set_errno(addrlist, save_errno, message, (code == '5')? FAIL : DEFER); + if (code != '5') /* Anything other than 5 is treated as temporary */ + { + if (save_errno > 0) + message = US string_sprintf("%s: %s", message, strerror(save_errno)); + if (host->next != NULL) log_write(0, LOG_MAIN, "%s", message); + deliver_msglog("%s %s\n", tod_stamp(tod_log), message); + *message_defer = TRUE; + } + } - /* If there's an errno, the message contains just the identity of - the host. */ + /* Otherwise, we have an I/O error or a timeout other than after MAIL or + ".", or some other transportation error. We defer all addresses and yield + DEFER, except for the case of failed add_headers expansion, or a transport + filter failure, when the yield should be ERROR, to stop it trying other + hosts. */ - if (code != '5') /* Anything other than 5 is treated as temporary */ + else { - if (save_errno > 0) - message = US string_sprintf("%s: %s", message, strerror(save_errno)); - if (host->next != NULL) log_write(0, LOG_MAIN, "%s", message); - deliver_msglog("%s %s\n", tod_stamp(tod_log), message); - *message_defer = TRUE; + yield = (save_errno == ERRNO_CHHEADER_FAIL || + save_errno == ERRNO_FILTER_FAIL)? ERROR : DEFER; + set_errno(addrlist, save_errno, message, DEFER, pass_message); } } } @@ -1744,6 +1996,7 @@ if (completed_address && ok && send_quit) )) { uschar *msg; + BOOL pass_message; if (send_rset) { @@ -1757,7 +2010,8 @@ if (completed_address && ok && send_quit) ob->command_timeout))) { int code; - send_quit = check_response(host, &errno, 0, buffer, &code, &msg); + send_quit = check_response(host, &errno, 0, buffer, &code, &msg, + &pass_message); if (!send_quit) { DEBUG(D_transport) debug_printf("%s\n", msg); @@ -1785,9 +2039,12 @@ if (completed_address && ok && send_quit) if (tls_active >= 0) { tls_close(TRUE); - ok = smtp_write_command(&outblock,FALSE,"EHLO %s\r\n",helo_data) >= 0 && - smtp_read_response(&inblock, buffer, sizeof(buffer), '2', - ob->command_timeout); + if (smtps) + ok = FALSE; + else + ok = smtp_write_command(&outblock,FALSE,"EHLO %s\r\n",helo_data) >= 0 && + smtp_read_response(&inblock, buffer, sizeof(buffer), '2', + ob->command_timeout); } #endif @@ -1803,7 +2060,7 @@ if (completed_address && ok && send_quit) /* If RSET failed and there are addresses left, they get deferred. */ - else set_errno(first_addr, errno, msg, DEFER); + else set_errno(first_addr, errno, msg, DEFER, FALSE); } } @@ -1846,7 +2103,7 @@ writing RSET might have failed, or there may be other addresses whose hosts are specified in the transports, and therefore not visible at top level, in which case continue_more won't get set. */ -close(inblock.sock); +(void)close(inblock.sock); continue_transport = NULL; continue_hostname = NULL; return yield; @@ -1899,7 +2156,7 @@ outblock.authenticating = FALSE; (void)smtp_write_command(&outblock, FALSE, "QUIT\r\n"); (void)smtp_read_response(&inblock, buffer, sizeof(buffer), '2', ob->command_timeout); -close(inblock.sock); +(void)close(inblock.sock); } @@ -1989,6 +2246,13 @@ DEBUG(D_transport) continue_hostname, continue_host_address); } +/* Set the flag requesting that these hosts be added to the waiting +database if the delivery fails temporarily or if we are running with +queue_smtp or a 2-stage queue run. This gets unset for certain +kinds of error, typically those that are specific to the message. */ + +update_waiting = TRUE; + /* If a host list is not defined for the addresses - they must all have the same one in order to be passed to a single transport - or if the transport has a host list with hosts_override set, use the host list supplied with the @@ -2038,6 +2302,15 @@ if (hostlist == NULL || (ob->hosts_override && ob->hosts != NULL)) host_build_hostlist(&hostlist, s, ob->hosts_randomize); + /* Check that the expansion yielded something useful. */ + if (hostlist == NULL) + { + addrlist->message = + string_sprintf("%s transport has empty hosts setting", tblock->name); + addrlist->transport_return = PANIC; + return FALSE; /* Only top address has status */ + } + /* If there was no expansion of hosts, save the host list for next time. */ @@ -2092,12 +2365,9 @@ else if (ob->hosts_randomize && hostlist->mx == MX_NONE && !continuing) } -/* Sort out the port. Set up a string for adding to the retry key if the port -number is not the standard SMTP port. */ +/* Sort out the default port. */ if (!smtp_get_port(ob->port, addrlist, &port, tid)) return FALSE; -pistring = string_sprintf(":%d", port); -if (Ustrcmp(pistring, ":25") == 0) pistring = US""; /* For each host-plus-IP-address on the list: @@ -2172,12 +2442,11 @@ for (cutoff_retry = 0; expired && uschar *retry_message_key = NULL; uschar *serialize_key = NULL; - /* Set the flag requesting that this host be added to the waiting - database if the delivery fails temporarily or if we are running with - queue_smtp or a 2-stage queue run. This gets unset for certain - kinds of error, typically those that are specific to the message. */ + /* Default next host is next host. :-) But this can vary if the + hosts_max_try limit is hit (see below). It may also be reset if a host + address is looked up here (in case the host was multihomed). */ - host->update_waiting = TRUE; + nexthost = host->next; /* If the address hasn't yet been obtained from the host name, look it up now, unless the host is already marked as unusable. If it is marked as @@ -2195,6 +2464,8 @@ for (cutoff_retry = 0; expired && if (host->address == NULL) { + int new_port, flags; + host_item *hh; uschar *canonical_name; if (host->status >= hstatus_unusable) @@ -2206,21 +2477,32 @@ for (cutoff_retry = 0; expired && DEBUG(D_transport) debug_printf("getting address for %s\n", host->name); + /* The host name is permitted to have an attached port. Find it, and + strip it from the name. Just remember it for now. */ + + new_port = host_item_get_port(host); + + /* Count hosts looked up */ + hosts_looked_up++; /* Find by name if so configured, or if it's an IP address. We don't just copy the IP address, because we need the test-for-local to happen. */ - if (ob->gethostbyname || string_is_ip_address(host->name, NULL) > 0) - rc = host_find_byname(host, NULL, &canonical_name, TRUE); + flags = HOST_FIND_BY_A; + if (ob->dns_qualify_single) flags |= HOST_FIND_QUALIFY_SINGLE; + if (ob->dns_search_parents) flags |= HOST_FIND_SEARCH_PARENTS; + + if (ob->gethostbyname || string_is_ip_address(host->name, NULL) != 0) + rc = host_find_byname(host, NULL, flags, &canonical_name, TRUE); else - { - int flags = HOST_FIND_BY_A; - if (ob->dns_qualify_single) flags |= HOST_FIND_QUALIFY_SINGLE; - if (ob->dns_search_parents) flags |= HOST_FIND_SEARCH_PARENTS; rc = host_find_bydns(host, NULL, flags, NULL, NULL, NULL, &canonical_name, NULL); - } + + /* Update the host (and any additional blocks, resulting from + multihoming) with a host-specific port, if any. */ + + for (hh = host; hh != nexthost; hh = hh->next) hh->port = new_port; /* Failure to find the host at this time (usually DNS temporary failure) is really a kind of routing failure rather than a transport failure. @@ -2278,10 +2560,8 @@ for (cutoff_retry = 0; expired && continue; /* With next host */ } - /* The default next host is the next host. :-) But this can vary if the - hosts_max_try limit is hit (see below). NOTE: we cannot put this setting - earlier than this, because a multihomed host whose addresses are not looked - up till just above will add to the host list. */ + /* Reset the default next host in case a multihomed host whose addresses + are not looked up till just above added to the host list. */ nexthost = host->next; @@ -2293,8 +2573,8 @@ for (cutoff_retry = 0; expired && doing a two-stage queue run, don't do this if forcing. */ if ((!deliver_force || queue_2stage) && (queue_smtp || - match_isinlist(addrlist->domain, &queue_smtp_domains, 0, NULL, NULL, - MCL_DOMAIN, TRUE, NULL) == OK)) + match_isinlist(addrlist->domain, &queue_smtp_domains, 0, + &domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) == OK)) { expired = FALSE; for (addr = addrlist; addr != NULL; addr = addr->next) @@ -2317,6 +2597,14 @@ for (cutoff_retry = 0; expired && deliver_host = host->name; deliver_host_address = host->address; + /* Set up a string for adding to the retry key if the port number is not + the standard SMTP port. A host may have its own port setting that overrides + the default. */ + + pistring = string_sprintf(":%d", (host->port == PORT_NONE)? + port : host->port); + if (Ustrcmp(pistring, ":25") == 0) pistring = US""; + /* Select IPv4 or IPv6, and choose an outgoing interface. If the interface string changes upon expansion, we must add it to the key that is used for retries, because connections to the same host from a different interface @@ -2369,9 +2657,9 @@ for (cutoff_retry = 0; expired && /* If there was a retry message key, implying that previously there was a message-specific defer, we don't want to update the list of - messages waiting for this host. */ + messages waiting for these hosts. */ - if (retry_message_key != NULL) host->update_waiting = FALSE; + if (retry_message_key != NULL) update_waiting = FALSE; continue; /* With the next host or IP address */ } } @@ -2442,7 +2730,7 @@ for (cutoff_retry = 0; expired && if (dont_deliver) { host_item *host2; - set_errno(addrlist, 0, NULL, OK); + set_errno(addrlist, 0, NULL, OK, FALSE); for (addr = addrlist; addr != NULL; addr = addr->next) { addr->host_used = host; @@ -2603,7 +2891,7 @@ for (cutoff_retry = 0; expired && to the retry chain. Note that if there was a message defer but now there is a host defer, the message defer record gets deleted. That seems perfectly reasonable. Also, stop the message from being remembered as waiting - for this host. */ + for specific hosts. */ if (message_defer || retry_message_key != NULL) { @@ -2617,7 +2905,7 @@ for (cutoff_retry = 0; expired && } retry_add_item(addrlist, retry_message_key, rf_message | rf_host | delete_flag); - host->update_waiting = FALSE; + update_waiting = FALSE; } /* Any return other than DEFER (that is, OK or ERROR) means that the @@ -2764,6 +3052,7 @@ for (addr = addrlist; addr != NULL; addr = addr->next) } else if (expired) { + setflag(addr, af_pass_message); /* This is not a security risk */ addr->message = (ob->delay_after_cutoff)? US"retry time not reached for any host after a long failure period" : US"all hosts have been failing for a long time and were last tried " @@ -2795,11 +3084,11 @@ for (addr = addrlist; addr != NULL; addr = addr->next) } /* Update the database which keeps information about which messages are waiting -for which hosts to become available. Each host in the list has a flag which is -set if the data is to be updated. For some message-specific errors, the flag is -turned off because we don't want follow-on deliveries in those cases. */ +for which hosts to become available. For some message-specific errors, the +update_waiting flag is turned off because we don't want follow-on deliveries in +those cases. */ -transport_update_waiting(hostlist, tblock->name); +if (update_waiting) transport_update_waiting(hostlist, tblock->name); END_TRANSPORT: