tom 2009/05/19 09:24:48 BST
Modified files: (Branch: DEVEL_PDKIM)
exim-src/src dkim.c drtables.c
exim-src/src/lookups Makefile
Removed files: (Branch: DEVEL_PDKIM)
exim-src/src/lookups dkim.c dkim.h
Log:
Remove deprecated "dkim" lookup in favor of ACL-style system
Revision Changes Path
1.1.2.8 +18 -1 exim/exim-src/src/dkim.c
1.9.2.2 +0 -22 exim/exim-src/src/drtables.c
1.8.2.1 +1 -2 exim/exim-src/src/lookups/Makefile
1.1.2.2 +0 -52 exim/exim-src/src/lookups/dkim.c (dead)
1.1.2.1 +0 -16 exim/exim-src/src/lookups/dkim.h (dead)
Index: dkim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/Attic/dkim.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- dkim.c 30 Apr 2009 08:21:30 -0000 1.1.2.7
+++ dkim.c 19 May 2009 08:24:47 -0000 1.1.2.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dkim.c,v 1.1.2.7 2009/04/30 08:21:30 tom Exp $ */
+/* $Cambridge: exim/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 @@
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");
Index: drtables.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/drtables.c,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- drtables.c 24 Feb 2009 15:57:55 -0000 1.9.2.1
+++ drtables.c 19 May 2009 08:24:48 -0000 1.9.2.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/drtables.c,v 1.9.2.1 2009/02/24 15:57:55 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/drtables.c,v 1.9.2.2 2009/05/19 08:24:48 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -105,11 +105,6 @@
#include "lookups/whoson.h"
#endif
-#ifndef DISABLE_DKIM
-#include "lookups/dkim.h"
-#endif
-
-
/* The second field in each item below is a set of bit flags:
lookup_querystyle => this is a query-style lookup,
@@ -176,23 +171,6 @@
#endif
},
-/* DKIM lookups */
-
- {
- US"dkim", /* lookup name */
- lookup_querystyle, /* query style */
-#ifndef DISABLE_DKIM
- dkim_open, /* open function */
- NULL, /* check function */
- dkim_find, /* find function */
- NULL, /* no close function */
- NULL, /* no tidy function */
- NULL /* no quoting function */
-#else
- NULL, NULL, NULL, NULL, NULL, NULL /* lookup not present */
-#endif
- },
-
/* Using DNS TXT records as a database */
{
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/src/lookups/Makefile,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- Makefile 14 Feb 2008 13:49:35 -0000 1.8
+++ Makefile 19 May 2009 08:24:48 -0000 1.8.2.1
@@ -1,11 +1,11 @@
-# $Cambridge: exim/exim-src/src/lookups/Makefile,v 1.8 2008/02/14 13:49:35 fanf2 Exp $
+# $Cambridge: exim/exim-src/src/lookups/Makefile,v 1.8.2.1 2009/05/19 08:24:48 tom Exp $
# Make file for building a library containing all the available lookups and
# calling it lookups.a. This is called from the main make file, after cd'ing
# to the lookups subdirectory. When the relevant LOOKUP_ macros are not
# defined, dummy modules get compiled.
-OBJ = cdb.o dbmdb.o dkim.o dnsdb.o dsearch.o ibase.o ldap.o lsearch.o mysql.o nis.o \
+OBJ = cdb.o dbmdb.o dnsdb.o dsearch.o ibase.o ldap.o lsearch.o mysql.o nis.o \
nisplus.o oracle.o passwd.o pgsql.o spf.o sqlite.o testdb.o whoson.o \
lf_check_file.o lf_quote.o lf_sqlperform.o
@@ -25,7 +25,6 @@
cdb.o: $(HDRS) cdb.c cdb.h
dbmdb.o: $(HDRS) dbmdb.c dbmdb.h
-dkim.o: $(HDRS) dkim.c dkim.h
dnsdb.o: $(HDRS) dnsdb.c dnsdb.h
dsearch.o: $(HDRS) dsearch.c dsearch.h
ibase.o: $(HDRS) ibase.c ibase.h
