X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d5b80e59458182b2d557a929a18cb8c70cd56b68..f3ebb786e451da973560f1c9d8cdb151d25108b5:/src/src/transports/lmtp.c diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c index f26050fdc..306ec450b 100644 --- a/src/src/transports/lmtp.c +++ b/src/src/transports/lmtp.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2016 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -122,7 +122,8 @@ Arguments: Returns: TRUE if a "QUIT" command should be sent, else FALSE */ -static BOOL check_response(int *errno_value, int more_errno, uschar *buffer, +static BOOL +check_response(int *errno_value, int more_errno, uschar *buffer, int *yield, uschar **message) { *yield = '4'; /* Default setting is to give a temporary error */ @@ -174,7 +175,7 @@ if (*errno_value == ERRNO_CHHEADER_FAIL) if (*errno_value == ERRNO_WRITEINCOMPLETE) { - *message = string_sprintf("failed to write a data block"); + *message = US"failed to write a data block"; return FALSE; } @@ -223,20 +224,24 @@ Returns: TRUE if successful, FALSE if not, with errno set static BOOL lmtp_write_command(int fd, const char *format, ...) { -int count, rc; +gstring gs = { .size = big_buffer_size, .ptr = 0, .s = big_buffer }; +int rc; va_list ap; + +/*XXX see comment in smtp_write_command() regarding leaving stuff in +big_buffer */ + va_start(ap, format); -if (!string_vformat(big_buffer, big_buffer_size, CS format, ap)) +if (!string_vformat(&gs, SVFMT_TAINT_NOCHK, CS format, ap)) { va_end(ap); errno = ERRNO_SMTPFORMAT; return FALSE; } va_end(ap); -count = Ustrlen(big_buffer); -DEBUG(D_transport|D_v) debug_printf(" LMTP>> %s", big_buffer); -rc = write(fd, big_buffer, count); -big_buffer[count-2] = 0; /* remove \r\n for debug and error message */ +DEBUG(D_transport|D_v) debug_printf(" LMTP>> %s", string_from_gstring(&gs)); +rc = write(fd, gs.s, gs.ptr); +gs.ptr -= 2; string_from_gstring(&gs); /* remove \r\n for debug and error message */ if (rc > 0) return TRUE; DEBUG(D_transport) debug_printf("write failed: %s\n", strerror(errno)); return FALSE; @@ -299,10 +304,10 @@ for (;;) *readptr = 0; /* In case nothing gets read */ sigalrm_seen = FALSE; - alarm(timeout); + ALARM(timeout); rc = Ufgets(readptr, size-1, f); save_errno = errno; - alarm(0); + ALARM_CLR(0); errno = save_errno; if (rc != NULL) break; /* A line has been read */ @@ -342,9 +347,8 @@ for (;;) { DEBUG(D_transport) { - int i; debug_printf("LMTP input line incomplete in one buffer:\n "); - for (i = 0; i < count; i++) + for (int i = 0; i < count; i++) { int c = (ptr[i]); if (mac_isprint(c)) debug_printf("%c", c); else debug_printf("<%d>", c); @@ -469,7 +473,6 @@ int fd_in = -1, fd_out = -1; int code, save_errno; BOOL send_data; BOOL yield = FALSE; -address_item *addr; uschar *igquotstr = US""; uschar *sockname = NULL; const uschar **argv; @@ -490,7 +493,7 @@ if (ob->cmd) return FALSE; /* If the -N option is set, can't do any more. Presume all has gone well. */ - if (dont_deliver) + if (f.dont_deliver) goto MINUS_N; /* As this is a local transport, we are already running with the required @@ -528,7 +531,7 @@ else } /* If the -N option is set, can't do any more. Presume all has gone well. */ - if (dont_deliver) + if (f.dont_deliver) goto MINUS_N; sockun.sun_family = AF_UNIX; @@ -553,7 +556,7 @@ allows for message+recipient checks after the message has been received. */ /* First thing is to wait for an initial greeting. */ -Ustrcpy(big_buffer, "initial connection"); +Ustrcpy(big_buffer, US"initial connection"); if (!lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) goto RESPONSE_FAILED; @@ -591,7 +594,7 @@ if (!lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) temporarily rejected; others may be accepted, for now. */ send_data = FALSE; -for (addr = addrlist; addr != NULL; addr = addr->next) +for (address_item * addr = addrlist; addr; addr = addr->next) { if (!lmtp_write_command(fd_in, "RCPT TO:<%s>%s\r\n", transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr)) @@ -641,7 +644,7 @@ if (send_data) sigalrm_seen = FALSE; transport_write_timeout = timeout; - Ustrcpy(big_buffer, "sending data block"); /* For error messages */ + Ustrcpy(big_buffer, US"sending data block"); /* For error messages */ DEBUG(D_transport|D_v) debug_printf(" LMTP>> writing message and terminating \".\"\n"); @@ -657,14 +660,14 @@ if (send_data) goto RESPONSE_FAILED; } - Ustrcpy(big_buffer, "end of data"); /* For error messages */ + Ustrcpy(big_buffer, US"end of data"); /* For error messages */ /* We now expect a response for every address that was accepted above, in the same order. For those that get a response, their status is fixed; any that are accepted have been handed over, even if later responses crash - at least, that's how I read RFC 2033. */ - for (addr = addrlist; addr != NULL; addr = addr->next) + for (address_item * addr = addrlist; addr; addr = addr->next) { if (addr->transport_return != PENDING_OK) continue; @@ -683,12 +686,11 @@ if (send_data) else if (errno != 0 || buffer[0] == 0) { - address_item *a; save_errno = errno; check_response(&save_errno, addr->more_errno, buffer, &code, &(addr->message)); addr->transport_return = (code == '5')? FAIL : DEFER; - for (a = addr->next; a != NULL; a = a->next) + for (address_item * a = addr->next; a; a = a->next) { if (a->transport_return != PENDING_OK) continue; a->basic_errno = addr->basic_errno; @@ -764,9 +766,9 @@ if (errno == ERRNO_CHHEADER_FAIL) string_sprintf("Failed to expand headers_add or headers_remove: %s", expand_string_message); else if (errno == ERRNO_FILTER_FAIL) - addrlist->message = string_sprintf("Filter process failure"); + addrlist->message = US"Filter process failure"; else if (errno == ERRNO_WRITEINCOMPLETE) - addrlist->message = string_sprintf("Failed repeatedly to write data"); + addrlist->message = US"Failed repeatedly to write data"; else if (errno == ERRNO_SMTPFORMAT) addrlist->message = US"overlong LMTP command generated"; else