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
Taint enforce: directory open backstops, single-key search filename
[exim.git]
/
src
/
src
/
queue.c
diff --git
a/src/src/queue.c
b/src/src/queue.c
index 9dbf3e7170a1bb27e3aeda81185b01d619f46f3f..e02ce3837a59613f1453f22e99765e60794ef8e2 100644
(file)
--- a/
src/src/queue.c
+++ b/
src/src/queue.c
@@
-125,8
+125,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
+169,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
+178,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);
@@
-649,12
+648,13
@@
for (int i = queue_run_in_order ? -1 : 0;
#endif
single_item_retry:
#endif
single_item_retry:
- if ((pid = exim_fork(US"qrun
delivery")) == 0)
+ if ((pid = exim_fork(US"qrun
-
delivery")) == 0)
{
int rc;
(void)close(pfd[pipe_read]);
rc = deliver_message(fq->text, force_delivery, FALSE);
{
int rc;
(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 "
@@
-706,7
+706,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. */
@@
-723,7
+723,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;
@@
-1409,13
+1409,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: "
@@
-1545,7
+1545,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