tom 2009/10/15 09:27:37 BST
Modified files:
exim-src/src dkim.c dkim.h expand.c globals.c
globals.h
Log:
Promote dkim_cur_signer to expansion variable
Revision Changes Path
1.6 +0 -1 exim/exim-src/src/dkim.c
1.4 +0 -2 exim/exim-src/src/dkim.h
1.103 +1 -0 exim/exim-src/src/expand.c
1.84 +1 -0 exim/exim-src/src/globals.c
1.65 +1 -0 exim/exim-src/src/globals.h
Index: dkim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dkim.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dkim.c 15 Oct 2009 08:06:23 -0000 1.5
+++ dkim.c 15 Oct 2009 08:27:37 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dkim.c,v 1.5 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/dkim.c,v 1.6 2009/10/15 08:27:37 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -19,7 +19,6 @@
pdkim_ctx *dkim_verify_ctx = NULL;
pdkim_signature *dkim_signatures = NULL;
pdkim_signature *dkim_cur_sig = NULL;
-uschar *dkim_cur_signer = NULL;
int dkim_exim_query_dns_txt(char *name, char *answer) {
dns_answer dnsa;
Index: dkim.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dkim.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkim.h 15 Oct 2009 08:06:23 -0000 1.3
+++ dkim.h 15 Oct 2009 08:27:37 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dkim.h,v 1.3 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/dkim.h,v 1.4 2009/10/15 08:27:37 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -15,8 +15,6 @@
uschar *dkim_exim_expand_query(int);
uschar *dkim_exim_expand_defaults(int);
-extern uschar *dkim_cur_signer;
-
#define DKIM_ALGO 1
#define DKIM_BODYLENGTH 2
#define DKIM_CANON_BODY 3
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- expand.c 15 Oct 2009 08:06:23 -0000 1.102
+++ expand.c 15 Oct 2009 08:27:37 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.102 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.103 2009/10/15 08:27:37 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -413,6 +413,7 @@
{ "dkim_canon_headers", vtype_dkim, (void *)DKIM_CANON_HEADERS },
{ "dkim_copiedheaders", vtype_dkim, (void *)DKIM_COPIEDHEADERS },
{ "dkim_created", vtype_dkim, (void *)DKIM_CREATED },
+ { "dkim_cur_signer", vtype_stringptr, &dkim_cur_signer },
{ "dkim_domain", vtype_stringptr, &dkim_signing_domain },
{ "dkim_expires", vtype_dkim, (void *)DKIM_EXPIRES },
{ "dkim_headernames", vtype_dkim, (void *)DKIM_HEADERNAMES },
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- globals.c 15 Oct 2009 08:06:23 -0000 1.83
+++ globals.c 15 Oct 2009 08:27:37 -0000 1.84
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.83 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.84 2009/10/15 08:27:37 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -532,6 +532,7 @@
BOOL disable_logging = FALSE;
#ifndef DISABLE_DKIM
+uschar *dkim_cur_signer = NULL;
uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
Index: globals.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- globals.h 15 Oct 2009 08:06:23 -0000 1.64
+++ globals.h 15 Oct 2009 08:27:37 -0000 1.65
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.h,v 1.64 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.h,v 1.65 2009/10/15 08:27:37 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -299,6 +299,7 @@
extern BOOL disable_logging; /* Disables log writing when TRUE */
#ifndef DISABLE_DKIM
+extern uschar *dkim_cur_signer; /* Expansion variable, holds the current "signer" domain or identity during a acl_smtp_dkim run */
extern uschar *dkim_signers; /* Expansion variable, holds colon-separated list of domains and identities that have signed a message */
extern uschar *dkim_signing_domain; /* Expansion variable, domain used for signing a message. */
extern uschar *dkim_signing_selector; /* Expansion variable, selector used for signing a message. */
