git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: increase resumption ticket lifetime to 2 hours
[users/heiko/exim.git]
/
src
/
exim_monitor
/
em_queue.c
diff --git
a/src/exim_monitor/em_queue.c
b/src/exim_monitor/em_queue.c
index 4bdc57ab93ccc4b3695c7043355328adf0bb61ec..c8d9a40fc02b1bc40098b62f21d578220d5ddece 100644
(file)
--- a/
src/exim_monitor/em_queue.c
+++ b/
src/exim_monitor/em_queue.c
@@
-2,7
+2,7
@@
* Exim Monitor *
*************************************************/
* Exim Monitor *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
18
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-63,7
+63,8
@@
if it is dest_remove, remove if present and return NULL. The
address is lowercased to start with, unless it begins with
"*", which it does for error messages. */
address is lowercased to start with, unless it begins with
"*", which it does for error messages. */
-dest_item *find_dest(queue_item *q, uschar *name, int action, BOOL caseless)
+dest_item *
+find_dest(queue_item *q, uschar *name, int action, BOOL caseless)
{
dest_item *dd;
dest_item **d = &(q->destinations);
{
dest_item *dd;
dest_item **d = &(q->destinations);
@@
-108,7
+109,8
@@
return dd;
* Clean up a dead queue item *
*************************************************/
* Clean up a dead queue item *
*************************************************/
-static void clean_up(queue_item *p)
+static void
+clean_up(queue_item *p)
{
dest_item *dd = p->destinations;
while (dd != NULL)
{
dest_item *dd = p->destinations;
while (dd != NULL)
@@
-149,7
+151,8
@@
return node;
* Set up new queue item *
*************************************************/
* Set up new queue item *
*************************************************/
-static queue_item *set_up(uschar *name, int dir_char)
+static queue_item *
+set_up(uschar *name, int dir_char)
{
int i, rc, save_errno;
struct stat statdata;
{
int i, rc, save_errno;
struct stat statdata;
@@
-162,7
+165,7
@@
uschar buffer[256];
q->next = q->prev = NULL;
q->destinations = NULL;
q->next = q->prev = NULL;
q->destinations = NULL;
-Ustr
cpy(q->name, name
);
+Ustr
ncpy(q->name, name, sizeof(q->name)
);
q->seen = TRUE;
q->frozen = FALSE;
q->dir_char = dir_char;
q->seen = TRUE;
q->frozen = FALSE;
q->dir_char = dir_char;
@@
-201,7
+204,7
@@
if it's there. */
else
{
else
{
- q->update_time = q->input_time = received_time;
+ q->update_time = q->input_time = received_time
.tv_sec
;
if ((p = strstric(sender_address+1, qualify_domain, FALSE)) != NULL &&
*(--p) == '@') *p = 0;
}
if ((p = strstric(sender_address+1, qualify_domain, FALSE)) != NULL &&
*(--p) == '@') *p = 0;
}
@@
-231,7
+234,7
@@
if (rc != spool_read_OK)
}
else
{
}
else
{
- deliver_freeze = FALSE;
+
f.
deliver_freeze = FALSE;
sender_address = msg;
recipients_count = 0;
}
sender_address = msg;
recipients_count = 0;
}
@@
-239,9
+242,9
@@
if (rc != spool_read_OK)
/* Now set up the remaining data. */
/* Now set up the remaining data. */
-q->frozen = deliver_freeze;
+q->frozen =
f.
deliver_freeze;
-if (sender_set_untrusted)
+if (
f.
sender_set_untrusted)
{
if (sender_address[0] == 0)
{
{
if (sender_address[0] == 0)
{
@@
-331,7
+334,8
@@
while (p != NULL)
-queue_item *find_queue(uschar *name, int action, int dir_char)
+queue_item *
+find_queue(uschar *name, int action, int dir_char)
{
int first = 0;
int last = queue_index_size - 1;
{
int first = 0;
int last = queue_index_size - 1;