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:
3d50ca3
)
tidying: dkim output buffer
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 21 Jul 2016 13:38:48 +0000
(14:38 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 2 Aug 2016 15:46:31 +0000
(16:46 +0100)
src/src/transport.c
patch
|
blob
|
history
diff --git
a/src/src/transport.c
b/src/src/transport.c
index 3c1b00501e2e981e8b360cc8c88ab08547d1a4d4..4675a2c56dec1a5810f06848e4217614bb190c0e 100644
(file)
--- a/
src/src/transport.c
+++ b/
src/src/transport.c
@@
-998,6
+998,7
@@
uschar * dkim_spool_name;
int sread = 0;
int wwritten = 0;
uschar *dkim_signature = NULL;
int sread = 0;
int wwritten = 0;
uschar *dkim_signature = NULL;
+int siglen;
off_t k_file_size;
/* If we can't sign, just call the original function. */
off_t k_file_size;
/* If we can't sign, just call the original function. */
@@
-1062,28
+1063,30
@@
if (dkim->dkim_private_key && dkim->dkim_domain && dkim->dkim_selector)
}
}
}
}
- if (dkim_signature)
+ siglen = 0;
+ }
+
+if (dkim_signature)
+ {
+ siglen = Ustrlen(dkim_signature);
+ while(siglen > 0)
{
{
- int siglen = Ustrlen(dkim_signature);
- while(siglen > 0)
- {
#ifdef SUPPORT_TLS
#ifdef SUPPORT_TLS
-
wwritten = tls_out.active == out_fd
-
? tls_write(FALSE, dkim_signature, siglen)
-
: write(out_fd, dkim_signature, siglen);
+ wwritten = tls_out.active == out_fd
+ ? tls_write(FALSE, dkim_signature, siglen)
+ : write(out_fd, dkim_signature, siglen);
#else
#else
-
wwritten = write(out_fd, dkim_signature, siglen);
+ wwritten = write(out_fd, dkim_signature, siglen);
#endif
#endif
- if (wwritten == -1)
- {
- /* error, bail out */
- save_errno = errno;
- rc = FALSE;
- goto CLEANUP;
- }
- siglen -= wwritten;
- dkim_signature += wwritten;
+ if (wwritten == -1)
+ {
+ /* error, bail out */
+ save_errno = errno;
+ rc = FALSE;
+ goto CLEANUP;
}
}
+ siglen -= wwritten;
+ dkim_signature += wwritten;
}
}
}
}