summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Kistner <tom@duncanthrax.net>2009-10-15 08:27:37 +0000
committerTom Kistner <tom@duncanthrax.net>2009-10-15 08:27:37 +0000
commit2df588c9eec886db81da1ff981946d2c91ae789d (patch)
tree02fbda12e2a8150129e1e0c652eb5016a698ef3c
parent9e5d6b5595f1b8a37fab6eaaa7b8f133e7ac3ff5 (diff)
Promote dkim_cur_signer to expansion variable
-rw-r--r--src/src/dkim.c3
-rw-r--r--src/src/dkim.h4
-rw-r--r--src/src/expand.c3
-rw-r--r--src/src/globals.c3
-rw-r--r--src/src/globals.h3
5 files changed, 8 insertions, 8 deletions
diff --git a/src/src/dkim.c b/src/src/dkim.c
index 0ac1aeccf..42b14b5da 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.c,v 1.5 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: 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;
diff --git a/src/src/dkim.h b/src/src/dkim.h
index 70258e3be..66b09f889 100644
--- a/src/src/dkim.h
+++ b/src/src/dkim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.h,v 1.3 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: 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 @@ void dkim_exim_acl_setup(uschar *);
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
diff --git a/src/src/expand.c b/src/src/expand.c
index a8fccac4c..47453dc6d 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/expand.c,v 1.102 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: 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 @@ static var_entry var_table[] = {
{ "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 },
diff --git a/src/src/globals.c b/src/src/globals.c
index 7546ed478..98e1da5d6 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.c,v 1.83 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: 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_ipv6 = FALSE;
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;
diff --git a/src/src/globals.h b/src/src/globals.h
index 87fc4457a..04a030bab 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.h,v 1.64 2009/10/15 08:06:23 tom Exp $ */
+/* $Cambridge: 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_ipv6; /* Don't do any IPv6 things */
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. */