projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OpenSSL: fix bulid on older library versions
[exim.git]
/
src
/
src
/
moan.c
diff --git
a/src/src/moan.c
b/src/src/moan.c
index 31d033c1adcf66ed51c9ad65307212fea66804a5..7d49c4cb1fb6e9a110b7462e039f9370a7c549ae 100644
(file)
--- a/
src/src/moan.c
+++ b/
src/src/moan.c
@@
-63,7
+63,7
@@
if (!message_id)
if (h->type == htype_id)
{
message_id = Ustrchr(h->text, ':') + 1;
if (h->type == htype_id)
{
message_id = Ustrchr(h->text, ':') + 1;
-
while (isspace(*message_id)) message_id++
;
+
Uskip_whitespace(&message_id)
;
}
for (h = header_list; h; h = h->next)
}
for (h = header_list; h; h = h->next)
@@
-160,15
+160,16
@@
if ( ident == ERRMESS_DMARC_FORENSIC
&& (s2 = expand_string(string_sprintf("${address:%s}", s)))
&& *s2
)
&& (s2 = expand_string(string_sprintf("${address:%s}", s)))
&& *s2
)
- pid = child_open_exim2(&fd, s2, bounce_sender_authentication);
+ pid = child_open_exim2(&fd, s2, bounce_sender_authentication,
+ US"moan_send_message");
else
{
s = NULL;
else
{
s = NULL;
- pid = child_open_exim(&fd);
+ pid = child_open_exim(&fd
, US"moan_send_message"
);
}
#else
}
#else
-pid = child_open_exim(&fd);
+pid = child_open_exim(&fd
, US"moan_send_message"
);
#endif
if (pid < 0)
#endif
if (pid < 0)
@@
-584,7
+585,7
@@
moan_tell_someone(uschar *who, address_item *addr,
FILE *f;
va_list ap;
int fd;
FILE *f;
va_list ap;
int fd;
-int pid = child_open_exim(&fd);
+int pid = child_open_exim(&fd
, US"moan_tell_someone"
);
if (pid < 0)
{
if (pid < 0)
{
@@
-691,7
+692,7
@@
fprintf(stderr, "%d previous message%s successfully processed.\n",
fprintf(stderr, "The rest of the batch was abandoned.\n");
fprintf(stderr, "The rest of the batch was abandoned.\n");
-exim_exit(yield
, US"batch"
);
+exim_exit(yield);
}
}
@@
-820,7
+821,7
@@
if (!(s = expand_string(syntax_errors_to)))
/* If we can't create a process to send the message, just forget about
it. */
/* If we can't create a process to send the message, just forget about
it. */
-pid = child_open_exim(&fd);
+pid = child_open_exim(&fd
, US"moan_skipped_syntax_errors"
);
if (pid < 0)
{
if (pid < 0)
{