Remove deprecated "dkim" lookup in favor of ACL-style system

[users/jgh/exim.git] / src / src / dkim.c

diff --git a/src/src/dkim.c b/src/src/dkim.c
index fe536d9caa0dbf00c40bf9ee73258141fd24214e..68cae73eb1907568fa977567d4206ac085083f30 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.c,v 1.1.2.7 2009/04/30 08:21:30 tom Exp $ */
+/* $Cambridge: exim/src/src/dkim.c,v 1.1.2.8 2009/05/19 08:24:47 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -87,7 +87,24 @@ int dkim_exim_verify_finish(void) {
   if (pdkim_feed_finish(dkim_verify_ctx,&dkim_signatures) != PDKIM_OK) return 0;
 
   while (dkim_signatures != NULL) {
-    debug_printf("DKIM: Signature from domain '%s': ",dkim_signatures->domain);
+    uschar *dkim_log = string_sprintf("DKIM: v=%u d=%s s=%s c=%s/%s a=%s ",
+                                      dkim_signatures->version,
+                                      dkim_signatures->domain,
+                                      dkim_signatures->selector,
+                                      (dkim_signatures->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
+                                      (dkim_signatures->canon_body    == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
+                                      (dkim_signatures->algo          == PDKIM_ALGO_RSA_SHA256)?"rsa-sha256":"rsa-sha1"
+
+
+                                      (dkim_signatures->identity != NULL)?dkim_signatures->identity:"<void>",
+                                      (dkim_signatures->created>0)?
+
+                                      );
+
+    dkim_log = string_cat(dkim_log);
+
+
+
     switch(dkim_signatures->verify_status) {
       case PDKIM_VERIFY_NONE:
         debug_printf("not verified\n");