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. */
continue;
}
completed_address = TRUE; /* NOW we can set this flag */
- conf = string_sprintf("LMTP Successful delivery:%s", string_printing(buffer));
+ 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