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
Improve log output when DKIM signing operation fails.
[exim.git]
/
src
/
src
/
dkim.c
diff --git
a/src/src/dkim.c
b/src/src/dkim.c
index eff59df0b7ad31dd0035fa72be7332147ff50ce8..e303776c29a1199272b2b1317439f9ad495a6f26 100644
(file)
--- a/
src/src/dkim.c
+++ b/
src/src/dkim.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/dkim.c,v 1.
7 2009/10/15 15:44:51
tom Exp $ */
+/* $Cambridge: exim/src/src/dkim.c,v 1.
11 2009/12/15 08:23:15
tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge
2009
*/
+/* Copyright (c) University of Cambridge
, 1995 - 2007
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Code for DKIM support. Other DKIM relevant code is in
/* See the file NOTICE for conditions of use and distribution. */
/* Code for DKIM support. Other DKIM relevant code is in
@@
-391,6
+391,7
@@
uschar *dkim_exim_sign(int dkim_fd,
uschar *rc = NULL;
pdkim_signature *signature;
int pdkim_canon;
uschar *rc = NULL;
pdkim_signature *signature;
int pdkim_canon;
+ int pdkim_rc;
int sread;
char buf[4096];
int save_errno = 0;
int sread;
char buf[4096];
int save_errno = 0;
@@
-430,7
+431,7
@@
uschar *dkim_exim_sign(int dkim_fd,
if (Ustrcmp(dkim_canon, "relaxed") == 0)
pdkim_canon = PDKIM_CANON_RELAXED;
else if (Ustrcmp(dkim_canon, "simple") == 0)
if (Ustrcmp(dkim_canon, "relaxed") == 0)
pdkim_canon = PDKIM_CANON_RELAXED;
else if (Ustrcmp(dkim_canon, "simple") == 0)
- pdkim_canon = PDKIM_CANON_
RELAXED
;
+ pdkim_canon = PDKIM_CANON_
SIMPLE
;
else {
log_write(0, LOG_MAIN, "DKIM: unknown canonicalization method '%s', defaulting to 'relaxed'.\n",dkim_canon);
pdkim_canon = PDKIM_CANON_RELAXED;
else {
log_write(0, LOG_MAIN, "DKIM: unknown canonicalization method '%s', defaulting to 'relaxed'.\n",dkim_canon);
pdkim_canon = PDKIM_CANON_RELAXED;
@@
-511,8
+512,11
@@
uschar *dkim_exim_sign(int dkim_fd,
goto CLEANUP;
}
goto CLEANUP;
}
- if (pdkim_feed_finish(ctx,&signature) != PDKIM_OK)
+ pdkim_rc = pdkim_feed_finish(ctx,&signature);
+ if (pdkim_rc != PDKIM_OK) {
+ log_write(0, LOG_MAIN|LOG_PANIC, "DKIM: signing failed (RC %d)", pdkim_rc);
goto CLEANUP;
goto CLEANUP;
+ }
rc = store_get(strlen(signature->signature_header)+3);
Ustrcpy(rc,US signature->signature_header);
rc = store_get(strlen(signature->signature_header)+3);
Ustrcpy(rc,US signature->signature_header);
@@
-525,6
+529,6
@@
uschar *dkim_exim_sign(int dkim_fd,
store_pool = old_pool;
errno = save_errno;
return rc;
store_pool = old_pool;
errno = save_errno;
return rc;
-}
;
+}
#endif
#endif