* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2023 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Functions for sending messages to sender or to mailmaster. */
void
moan_write_from(FILE *f)
{
-uschar * s = expand_string(dsn_from);
-if (!s)
+uschar * s;
+GET_OPTION("dsn_from");
+if (!(s = expand_string(dsn_from)))
{
log_write(0, LOG_MAIN|LOG_PANIC,
"Failed to expand dsn_from (using default): %s", expand_string_message);
/* We limit the total length of references. Although there is no fixed
limit, some systems do not like headers growing beyond recognition.
Keep the first message ID for the thread root and the last few for
-the position inside the thread, up to a maximum of 12 altogether. */
+the position inside the thread, up to a maximum of 12 altogether.
+Also apply the max line length limit from RFC 2822 2.1.1
+
+XXX preferably we would get any limit from the outbound transport,
+passed in here for a limit value.
+*/
if (h || message_id)
{
- fprintf(fp, "References:");
+ unsigned use = fprintf(fp, "References:");
+ if (message_id) use += Ustrlen(message_id) + 1;
if (h)
{
const uschar * s;
s = Ustrchr(h->text, ':') + 1;
f.parse_allow_group = FALSE;
while (*s && (s = parse_message_id(s, &id, &error)))
- if (reference_count == nelem(referenced_ids))
- {
- memmove(referenced_ids + 1, referenced_ids + 2,
- sizeof(referenced_ids) - 2*sizeof(uschar *));
- referenced_ids[reference_count - 1] = id;
- }
+ {
+ unsigned this = Ustrlen(id);
+ if ( reference_count == nelem(referenced_ids)
+ || use + this + reference_count > 998
+ )
+ {
+ if (reference_count > 1)
+ {
+ /* drop position 1 and shuffle down */
+ use -= Ustrlen(referenced_ids + 1);
+ memmove(referenced_ids + 1, referenced_ids + 2,
+ sizeof(referenced_ids) - 2*sizeof(*referenced_ids));
+
+ /* append new one */
+ referenced_ids[reference_count - 1] = id;
+ }
+ }
else
referenced_ids[reference_count++] = id;
+ use += this;
+ }
for (int i = 0; i < reference_count; ++i)
fprintf(fp, " %s", referenced_ids[i]);
*/
BOOL
-moan_send_message(uschar *recipient, int ident, error_block *eblock,
- header_line *headers, FILE *message_file, uschar *firstline)
+moan_send_message(const uschar * recipient, int ident, error_block * eblock,
+ header_line * headers, FILE * message_file, uschar * firstline)
{
int written = 0;
int fd;
/* For DMARC if there is a specific sender set, expand the variable for the
header From: and grab the address from that for the envelope FROM. */
+GET_OPTION("dmarc_forensic_sender");
if ( ident == ERRMESS_DMARC_FORENSIC
&& dmarc_forensic_sender
&& (s = expand_string(dmarc_forensic_sender))
if (bounce_return_body && message_file)
{
BOOL enddot = f.dot_ends && message_file == stdin;
- uschar * buf = store_get(bounce_return_linesize_limit+2, TRUE);
+ uschar * buf = store_get(bounce_return_linesize_limit+2, GET_TAINTED);
if (firstline) fprintf(fp, "%s", CS firstline);
{
uschar *new_sender = NULL;
if (regex_match_and_setup(regex_From, big_buffer, 0, -1))
+ {
+ GET_OPTION("uucp_from_sender");
new_sender = expand_string(uucp_from_sender);
+ }
if (new_sender) sender_address = new_sender;
- else firstline = big_buffer;
+ else firstline = big_buffer;
}
/* If viable sender address, send a message */
case ERRMESS_TOOMANYRECIP:
log_write(0, LOG_MAIN, "%s: too many recipients (max set to %d)", msg,
- recipients_max);
+ recipients_max_expanded);
break;
case ERRMESS_LOCAL_SCAN:
fprintf(f, "\nThe following address(es) have yet to be delivered:\n");
for (; addr; addr = addr->next)
{
- uschar * parent = addr->parent ? addr->parent->address : NULL;
+ const uschar * parent = addr->parent ? addr->parent->address : NULL;
fprintf(f, " %s", addr->address);
if (parent) fprintf(f, " <%s>", parent);
if (addr->basic_errno > 0) fprintf(f, ": %s", strerror(addr->basic_errno));
*/
uschar *
-moan_check_errorcopy(uschar *recipient)
+moan_check_errorcopy(const uschar * recipient)
{
-uschar *item, *localpart, *domain;
-const uschar *listptr = errors_copy;
+uschar * item;
+const uschar * localpart, * domain;
+const uschar * listptr = errors_copy;
uschar *yield = NULL;
int sep = 0;
int llen;
-if (errors_copy == NULL) return NULL;
+if (!errors_copy) return NULL;
/* Set up pointer to the local part and domain, and compute the
length of the local part. */
localpart = recipient;
domain = Ustrrchr(recipient, '@');
-if (domain == NULL) return NULL; /* should not occur, but avoid crash */
+if (!domain) return NULL; /* should not occur, but avoid crash */
llen = domain++ - recipient;
/* Scan through the configured items */
while ((item = string_nextinlist(&listptr, &sep, NULL, 0)))
{
- const uschar *newaddress = item;
- const uschar *pattern = string_dequote(&newaddress);
+ const uschar * newaddress = item;
+ const uschar * pattern = string_dequote(&newaddress);
/* If no new address found, just skip this item. */
- while (isspace(*newaddress)) newaddress++;
- if (*newaddress == 0) continue;
+ if (!Uskip_whitespace(&newaddress)) continue;
/* We now have an item to match as an address in item, and the additional
address in newaddress. If the pattern matches, expand the new address string
git://git.exim.org / exim.git / blobdiff