michael 2010/02/19 10:30:13 GMT
Modified files:
exim-src/src dkim.c
Log:
Bug fix for yesterday's change, which worked in a production system
for quite some time and broke right after comitting it to CVS.
Revision Changes Path
1.13 +9 -6 exim/exim-src/src/dkim.c
Index: dkim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dkim.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dkim.c 18 Feb 2010 12:09:15 -0000 1.12
+++ dkim.c 19 Feb 2010 10:30:13 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dkim.c,v 1.12 2010/02/18 12:09:15 michael Exp $ */
+/* $Cambridge: exim/exim-src/src/dkim.c,v 1.13 2010/02/19 10:30:13 michael Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -458,13 +458,16 @@
pdkim_canon = PDKIM_CANON_RELAXED;
}
- dkim_sign_headers_expanded = expand_string(dkim_sign_headers);
- if (dkim_sign_headers_expanded == NULL) {
- log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand "
- "dkim_sign_headers: %s", expand_string_message);
- rc = NULL;
- goto CLEANUP;
+ if (dkim_sign_headers) {
+ dkim_sign_headers_expanded = expand_string(dkim_sign_headers);
+ if (dkim_sign_headers_expanded == NULL) {
+ log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand "
+ "dkim_sign_headers: %s", expand_string_message);
+ rc = NULL;
+ goto CLEANUP;
+ }
}
+ /* else pass NULL, which means default header list */
/* Get private key to use. */
dkim_private_key_expanded = expand_string(dkim_private_key);
