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: check on supplied buffer vs. list when extracting elements
[exim.git]
/
src
/
src
/
daemon.c
diff --git
a/src/src/daemon.c
b/src/src/daemon.c
index 1a747af79b9eff485f51654f0369bd7bb2c8195d..6560da1d4f18419ed829938c53a601658bf728d6 100644
(file)
--- a/
src/src/daemon.c
+++ b/
src/src/daemon.c
@@
-1353,7
+1353,7
@@
if (f.daemon_listen && !f.inetd_wait_mode)
list = override_local_interfaces;
sep = 0;
list = override_local_interfaces;
sep = 0;
- while ((s = string_nextinlist(&list, &sep,
big_buffer, big_buffer_size
)))
+ while ((s = string_nextinlist(&list, &sep,
NULL, 0
)))
{
uschar joinstr[4];
gstring ** gp = Ustrpbrk(s, ".:") ? &new_local_interfaces : &new_smtp_port;
{
uschar joinstr[4];
gstring ** gp = Ustrpbrk(s, ".:") ? &new_local_interfaces : &new_smtp_port;
@@
-1391,13
+1391,13
@@
if (f.daemon_listen && !f.inetd_wait_mode)
list = daemon_smtp_port;
sep = 0;
list = daemon_smtp_port;
sep = 0;
- while ((s = string_nextinlist(&list, &sep,
big_buffer, big_buffer_size
)))
+ while ((s = string_nextinlist(&list, &sep,
NULL, 0
)))
pct++;
default_smtp_port = store_get((pct+1) * sizeof(int), FALSE);
list = daemon_smtp_port;
sep = 0;
for (pct = 0;
pct++;
default_smtp_port = store_get((pct+1) * sizeof(int), FALSE);
list = daemon_smtp_port;
sep = 0;
for (pct = 0;
- (s = string_nextinlist(&list, &sep,
big_buffer, big_buffer_size
));
+ (s = string_nextinlist(&list, &sep,
NULL, 0
));
pct++)
{
if (isdigit(*s))
pct++)
{
if (isdigit(*s))
@@
-2180,6
+2180,7
@@
for (;;)
#ifdef EXPERIMENTAL_QUEUE_RAMP
if (*queuerun_msgid)
{
#ifdef EXPERIMENTAL_QUEUE_RAMP
if (*queuerun_msgid)
{
+ log_write(0, LOG_MAIN, "notify triggered queue run");
extra[extracount++] = queuerun_msgid; /* Trigger only the */
extra[extracount++] = queuerun_msgid; /* one message */
}
extra[extracount++] = queuerun_msgid; /* Trigger only the */
extra[extracount++] = queuerun_msgid; /* one message */
}
@@
-2214,6
+2215,7
@@
for (;;)
#ifdef EXPERIMENTAL_QUEUE_RAMP
if (*queuerun_msgid)
{
#ifdef EXPERIMENTAL_QUEUE_RAMP
if (*queuerun_msgid)
{
+ log_write(0, LOG_MAIN, "notify triggered queue run");
f.queue_2stage = FALSE;
queue_run(queuerun_msgid, queuerun_msgid, FALSE);
}
f.queue_2stage = FALSE;
queue_run(queuerun_msgid, queuerun_msgid, FALSE);
}