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
tidying
[exim.git]
/
src
/
src
/
receive.c
diff --git
a/src/src/receive.c
b/src/src/receive.c
index 6b5a28d3119b35637abbd1ca1243198abb7d0638..ada3ca519c66082412ac80055667283443384838 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-3837,7
+3837,6
@@
else
string_from_gstring(g), istemp, string_printing(errmsg));
if (smtp_input)
string_from_gstring(g), istemp, string_printing(errmsg));
if (smtp_input)
- {
if (!smtp_batched_input)
{
smtp_respond(smtp_code, 3, TRUE, errmsg);
if (!smtp_batched_input)
{
smtp_respond(smtp_code, 3, TRUE, errmsg);
@@
-3848,7
+3847,6
@@
else
else
moan_smtp_batch(NULL, "%s %s", smtp_code, errmsg);
/* Does not return */
else
moan_smtp_batch(NULL, "%s %s", smtp_code, errmsg);
/* Does not return */
- }
else
{
fseek(spool_data_file, (long int)SPOOL_DATA_START_OFFSET, SEEK_SET);
else
{
fseek(spool_data_file, (long int)SPOOL_DATA_START_OFFSET, SEEK_SET);
@@
-4026,18
+4024,14
@@
if (proxy_session && LOGGING(proxy))
if (chunking_state > CHUNKING_OFFERED)
g = string_catn(g, US" K", 2);
if (chunking_state > CHUNKING_OFFERED)
g = string_catn(g, US" K", 2);
-sprintf(CS big_buffer, "%d", msg_size);
-g = string_append(g, 2, US" S=", big_buffer);
+g = string_fmt_append(g, " S=%d", msg_size);
/* log 8BITMIME mode announced in MAIL_FROM
0 ... no BODY= used
7 ... 7BIT
8 ... 8BITMIME */
if (LOGGING(8bitmime))
/* log 8BITMIME mode announced in MAIL_FROM
0 ... no BODY= used
7 ... 7BIT
8 ... 8BITMIME */
if (LOGGING(8bitmime))
- {
- sprintf(CS big_buffer, "%d", body_8bitmime);
- g = string_append(g, 2, US" M8S=", big_buffer);
- }
+ g = string_fmt_append(g, " M8S=%d", body_8bitmime);
#ifndef DISABLE_DKIM
if (LOGGING(dkim) && dkim_verify_overall)
#ifndef DISABLE_DKIM
if (LOGGING(dkim) && dkim_verify_overall)