git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid modifying global errno when raising event
[exim.git]
/
src
/
src
/
queue.c
diff --git
a/src/src/queue.c
b/src/src/queue.c
index 2b64f52296c7f5f72710f406d0d2cd7c787196f6..dff6168c02012528febf1ceb8475e01fe611eee1 100644
(file)
--- a/
src/src/queue.c
+++ b/
src/src/queue.c
@@
-3,6
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
@@
-25,6
+26,9
@@
Michael Haardt. */
#define LOG2_MAXNODES 32
#define LOG2_MAXNODES 32
+#ifndef DISABLE_TLS
+static BOOL queue_tls_init = FALSE;
+#endif
/*************************************************
* Helper sort function for queue_get_spool_list *
/*************************************************
* Helper sort function for queue_get_spool_list *
@@
-125,8
+129,6
@@
int resetflags = -1;
int subptr;
queue_filename *yield = NULL;
queue_filename *last = NULL;
int subptr;
queue_filename *yield = NULL;
queue_filename *last = NULL;
-struct dirent *ent;
-DIR *dd;
uschar buffer[256];
queue_filename *root[LOG2_MAXNODES];
uschar buffer[256];
queue_filename *root[LOG2_MAXNODES];
@@
-171,6
+173,7
@@
for (; i <= *subcount; i++)
{
int count = 0;
int subdirchar = subdirs[i]; /* 0 for main directory */
{
int count = 0;
int subdirchar = subdirs[i]; /* 0 for main directory */
+ DIR *dd;
if (subdirchar != 0)
{
if (subdirchar != 0)
{
@@
-179,12
+182,12
@@
for (; i <= *subcount; i++)
}
DEBUG(D_queue_run) debug_printf("looking in %s\n", buffer);
}
DEBUG(D_queue_run) debug_printf("looking in %s\n", buffer);
- if (!(dd =
opendir(CS
buffer)))
+ if (!(dd =
exim_opendir(
buffer)))
continue;
/* Now scan the directory. */
continue;
/* Now scan the directory. */
-
while ((ent = readdir(dd))
)
+
for (struct dirent *ent; ent = readdir(dd);
)
{
uschar *name = US ent->d_name;
int len = Ustrlen(name);
{
uschar *name = US ent->d_name;
int len = Ustrlen(name);
@@
-347,8
+350,8
@@
queue_run(uschar *start_id, uschar *stop_id, BOOL recurse)
{
BOOL force_delivery = f.queue_run_force || deliver_selectstring != NULL ||
deliver_selectstring_sender != NULL;
{
BOOL force_delivery = f.queue_run_force || deliver_selectstring != NULL ||
deliver_selectstring_sender != NULL;
-const pcre *selectstring_regex = NULL;
-const pcre *selectstring_regex_sender = NULL;
+const pcre
2_code
*selectstring_regex = NULL;
+const pcre
2_code
*selectstring_regex_sender = NULL;
uschar *log_detail = NULL;
int subcount = 0;
uschar subdirs[64];
uschar *log_detail = NULL;
int subcount = 0;
uschar subdirs[64];
@@
-393,12
+396,18
@@
if (!recurse)
p += sprintf(CS p, " -q%s", extras);
if (deliver_selectstring)
p += sprintf(CS p, " -q%s", extras);
if (deliver_selectstring)
- p += sprintf(CS p, " -R%s %s", f.deliver_selectstring_regex? "r" : "",
- deliver_selectstring);
+ {
+ snprintf(CS p, big_buffer_size - (p - big_buffer), " -R%s %s",
+ f.deliver_selectstring_regex? "r" : "", deliver_selectstring);
+ p += Ustrlen(CCS p);
+ }
if (deliver_selectstring_sender)
if (deliver_selectstring_sender)
- p += sprintf(CS p, " -S%s %s", f.deliver_selectstring_sender_regex? "r" : "",
- deliver_selectstring_sender);
+ {
+ snprintf(CS p, big_buffer_size - (p - big_buffer), " -S%s %s",
+ f.deliver_selectstring_sender_regex? "r" : "", deliver_selectstring_sender);
+ p += Ustrlen(CCS p);
+ }
log_detail = string_copy(big_buffer);
if (*queue_name)
log_detail = string_copy(big_buffer);
if (*queue_name)
@@
-496,10
+505,8
@@
for (int i = queue_run_in_order ? -1 : 0;
}
else
for (i = 0; qpid[i]; ) i++;
}
else
for (i = 0; qpid[i]; ) i++;
- DEBUG(D_queue_run) debug_printf("q2stage forking\n");
- if ((qpid[i] = exim_fork(US"qrun phase one")))
+ if ((qpid[i] = exim_fork(US"qrun-phase-one")))
continue; /* parent loops around */
continue; /* parent loops around */
- DEBUG(D_queue_run) debug_printf("q2stage child\n");
}
/* Skip this message unless it's within the ID limits */
}
/* Skip this message unless it's within the ID limits */
@@
-562,9
+569,7
@@
for (int i = queue_run_in_order ? -1 : 0;
else if ( deliver_selectstring_sender
&& !(f.deliver_selectstring_sender_regex
else if ( deliver_selectstring_sender
&& !(f.deliver_selectstring_sender_regex
- ? (pcre_exec(selectstring_regex_sender, NULL,
- CS sender_address, Ustrlen(sender_address), 0, PCRE_EOPT,
- NULL, 0) >= 0)
+ ? regex_match(selectstring_regex_sender, sender_address, -1, NULL)
: (strstric(sender_address, deliver_selectstring_sender, FALSE)
!= NULL)
) )
: (strstric(sender_address, deliver_selectstring_sender, FALSE)
!= NULL)
) )
@@
-583,8
+588,7
@@
for (int i = queue_run_in_order ? -1 : 0;
{
uschar *address = recipients_list[i].address;
if ( (f.deliver_selectstring_regex
{
uschar *address = recipients_list[i].address;
if ( (f.deliver_selectstring_regex
- ? (pcre_exec(selectstring_regex, NULL, CS address,
- Ustrlen(address), 0, PCRE_EOPT, NULL, 0) >= 0)
+ ? regex_match(selectstring_regex, address, -1, NULL)
: (strstric(address, deliver_selectstring, FALSE) != NULL)
)
&& tree_search(tree_nonrecipients, address) == NULL
: (strstric(address, deliver_selectstring, FALSE) != NULL)
)
&& tree_search(tree_nonrecipients, address) == NULL
@@
-650,14
+654,24
@@
for (int i = queue_run_in_order ? -1 : 0;
report_time_since(×tamp_startup, US"queue msg selected");
#endif
report_time_since(×tamp_startup, US"queue msg selected");
#endif
+#ifndef DISABLE_TLS
+ if (!queue_tls_init)
+ {
+ queue_tls_init = TRUE;
+ /* Preload TLS library info for smtp transports. Once, and only if we
+ have a delivery to do. */
+ tls_client_creds_reload(FALSE);
+ }
+#endif
+
single_item_retry:
single_item_retry:
- if ((pid = exim_fork(US"qrun
delivery")) == 0)
+ if ((pid = exim_fork(US"qrun
-
delivery")) == 0)
{
int rc;
{
int rc;
- testharness_pause_ms(100);
(void)close(pfd[pipe_read]);
rc = deliver_message(fq->text, force_delivery, FALSE);
(void)close(pfd[pipe_read]);
rc = deliver_message(fq->text, force_delivery, FALSE);
- exim_underbar_exit(rc == DELIVER_NOT_ATTEMPTED, US"qrun-delivery");
+ exim_underbar_exit(rc == DELIVER_NOT_ATTEMPTED
+ ? EXIT_FAILURE : EXIT_SUCCESS);
}
if (pid < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "fork of delivery process from "
}
if (pid < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "fork of delivery process from "
@@
-709,7
+723,7
@@
single_item_retry:
/* If initial of a 2-phase run, we are a child - so just exit */
if (f.queue_2stage && !queue_run_in_order)
/* If initial of a 2-phase run, we are a child - so just exit */
if (f.queue_2stage && !queue_run_in_order)
- exim_exit(EXIT_SUCCESS
, US"2-phase child"
);
+ exim_exit(EXIT_SUCCESS);
/* If we are in the test harness, and this is not the first of a 2-stage
queue run, update fudged queue times. */
/* If we are in the test harness, and this is not the first of a 2-stage
queue run, update fudged queue times. */
@@
-726,7
+740,7
@@
single_item_retry:
go_around:
/* If initial of a 2-phase run, we are a child - so just exit */
if (f.queue_2stage && !queue_run_in_order)
go_around:
/* If initial of a 2-phase run, we are a child - so just exit */
if (f.queue_2stage && !queue_run_in_order)
- exim_exit(EXIT_SUCCESS
, US"2-phase child"
);
+ exim_exit(EXIT_SUCCESS);
} /* End loop for list of messages */
tree_nonrecipients = NULL;
} /* End loop for list of messages */
tree_nonrecipients = NULL;
@@
-1334,15
+1348,15
@@
switch(action)
deliver_domain = dom
? CUS string_copyn(addr+dom, end - dom) : CUS"";
deliver_domain = dom
? CUS string_copyn(addr+dom, end - dom) : CUS"";
- event_raise(event_action, US"msg:fail:internal",
- string_sprintf("message removed by %s", username));
+
(void)
event_raise(event_action, US"msg:fail:internal",
+ string_sprintf("message removed by %s", username)
, NULL
);
deliver_localpart = save_local;
deliver_domain = save_domain;
}
}
}
deliver_localpart = save_local;
deliver_domain = save_domain;
}
}
}
- (void) event_raise(event_action, US"msg:complete", NULL);
+ (void) event_raise(event_action, US"msg:complete", NULL
, NULL
);
#endif
log_write(0, LOG_MAIN, "removed by %s", username);
log_write(0, LOG_MAIN, "Completed");
#endif
log_write(0, LOG_MAIN, "removed by %s", username);
log_write(0, LOG_MAIN, "Completed");
@@
-1412,13
+1426,13
@@
switch(action)
parse_extract_address(argv[recipients_arg], &errmess, &start, &end,
&domain, (action == MSG_EDIT_SENDER));
parse_extract_address(argv[recipients_arg], &errmess, &start, &end,
&domain, (action == MSG_EDIT_SENDER));
- if (
recipient == NULL
)
+ if (
!recipient
)
{
yield = FALSE;
printf("- error while %s:\n bad address %s: %s\n",
doing, argv[recipients_arg], errmess);
}
{
yield = FALSE;
printf("- error while %s:\n bad address %s: %s\n",
doing, argv[recipients_arg], errmess);
}
- else if (
recipient[0] != 0
&& domain == 0)
+ else if (
*recipient
&& domain == 0)
{
yield = FALSE;
printf("- error while %s:\n bad address %s: "
{
yield = FALSE;
printf("- error while %s:\n bad address %s: "
@@
-1533,7
+1547,7
@@
if (s)
/******************************************************************************/
/******************************************************************************/
/******************************************************************************/
/******************************************************************************/
-#if
def EXPERIMENTAL
_QUEUE_RAMP
+#if
ndef DISABLE
_QUEUE_RAMP
void
queue_notify_daemon(const uschar * msgid)
{
void
queue_notify_daemon(const uschar * msgid)
{
@@
-1548,7
+1562,6
@@
memcpy(buf+1, msgid, MESSAGE_ID_LENGTH+1);
if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0)
{
struct sockaddr_un sa_un = {.sun_family = AF_UNIX};
if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0)
{
struct sockaddr_un sa_un = {.sun_family = AF_UNIX};
- int slen;
#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
int len = offsetof(struct sockaddr_un, sun_path) + 1
#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
int len = offsetof(struct sockaddr_un, sun_path) + 1