git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
52a7b5f
)
Care with printability of logged information. Bug 1609
author
Simon Amor
<simon@leaky.org>
Mon, 6 Apr 2015 17:12:54 +0000
(18:12 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 6 Apr 2015 17:15:15 +0000
(18:15 +0100)
src/src/smtp_in.c
patch
|
blob
|
history
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index 58ca02dbe3496cc9de40441f19e9e002333859d9..9b7c59d6290934ee61c3909c080b6cdc55459542 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-2438,7
+2438,7
@@
if (++synprot_error_count > smtp_max_synprot_errors)
yield = 1;
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
"syntax or protocol errors (last command was \"%s\")",
yield = 1;
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
"syntax or protocol errors (last command was \"%s\")",
- host_and_ident(FALSE), s
mtp_cmd_buffer
);
+ host_and_ident(FALSE), s
tring_printing(smtp_cmd_buffer)
);
}
if (code > 0)
}
if (code > 0)
@@
-3397,7
+3397,7
@@
while (done <= 0)
{
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
"syntax or protocol errors (last command was \"%s\")",
{
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
"syntax or protocol errors (last command was \"%s\")",
- host_and_ident(FALSE), s
mtp_cmd_buffer
);
+ host_and_ident(FALSE), s
tring_printing(smtp_cmd_buffer)
);
done = 1;
}
done = 1;
}
@@
-5015,7
+5015,7
@@
while (done <= 0)
done = 2;
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
"unrecognized commands (last was \"%s\")", host_and_ident(FALSE),
done = 2;
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
"unrecognized commands (last was \"%s\")", host_and_ident(FALSE),
- s
mtp_cmd_buffer
);
+ s
tring_printing(smtp_cmd_buffer)
);
}
else
done = synprot_error(L_smtp_syntax_error, 500, NULL,
}
else
done = synprot_error(L_smtp_syntax_error, 500, NULL,