From 2afff184f2cf3039da25795e92601f0339b6973d Mon Sep 17 00:00:00 2001 From: Tom Kistner Date: Tue, 9 Jun 2009 18:38:35 +0000 Subject: [PATCH] rename main option --- src/src/globals.c | 4 ++-- src/src/globals.h | 4 ++-- src/src/readconf.c | 4 ++-- src/src/receive.c | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/src/globals.c b/src/src/globals.c index 32990a65b..288f92b08 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.81.2.5 2009/05/27 17:26:54 tom Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.81.2.6 2009/06/09 18:38:35 tom Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -535,7 +535,7 @@ BOOL disable_logging = FALSE; uschar *dkim_signing_domains = NULL; uschar *dkim_signing_domain = NULL; uschar *dkim_signing_selector = NULL; -uschar *dkim_verify_domains = US"$dkim_signing_domains"; +uschar *dkim_verify_signers = US"$dkim_signing_domains"; BOOL dkim_collect_input = FALSE; BOOL dkim_disable_verify = FALSE; #endif diff --git a/src/src/globals.h b/src/src/globals.h index 6e32e093e..add5e4333 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/globals.h,v 1.62.2.4 2009/05/27 17:26:54 tom Exp $ */ +/* $Cambridge: exim/src/src/globals.h,v 1.62.2.5 2009/06/09 18:38:35 tom Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -302,7 +302,7 @@ extern BOOL disable_logging; /* Disables log writing when TRUE */ extern uschar *dkim_signing_domains; /* Expansion variable, holds colon-separated list of domains 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. */ -extern uschar *dkim_verify_domains; /* Colon-separated list of domains for each of which we call the DKIM ACL */ +extern uschar *dkim_verify_signers; /* Colon-separated list of domains for each of which we call the DKIM ACL */ extern BOOL dkim_collect_input; /* Runtime flag that tracks wether SMTP input is fed to DKIM validation */ extern BOOL dkim_disable_verify; /* Set via ACL control statement. When set, DKIM verification is disabled for the current message */ #endif diff --git a/src/src/readconf.c b/src/src/readconf.c index ab4faebc3..4cc439b09 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/readconf.c,v 1.35.2.2 2009/05/27 17:26:55 tom Exp $ */ +/* $Cambridge: exim/src/src/readconf.c,v 1.35.2.3 2009/06/09 18:38:35 tom Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -209,7 +209,7 @@ static optionlist optionlist_config[] = { #endif { "disable_ipv6", opt_bool, &disable_ipv6 }, #ifndef DISABLE_DKIM - { "dkim_verify_domains", opt_stringptr, &dkim_verify_domains }, + { "dkim_verify_signers", opt_stringptr, &dkim_verify_signers }, #endif { "dns_again_means_nonexist", opt_stringptr, &dns_again_means_nonexist }, { "dns_check_names_pattern", opt_stringptr, &check_dns_names_pattern }, diff --git a/src/src/receive.c b/src/src/receive.c index cb29e35da..7ad34fe6e 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/receive.c,v 1.45.2.5 2009/06/08 21:06:32 tom Exp $ */ +/* $Cambridge: exim/src/src/receive.c,v 1.45.2.6 2009/06/09 18:38:35 tom Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -2977,21 +2977,21 @@ else /* Check if we must run the DKIM ACL */ if ((acl_smtp_dkim != NULL) && - (dkim_verify_domains != NULL) && - (dkim_verify_domains[0] != '\0')) + (dkim_verify_signers != NULL) && + (dkim_verify_signers[0] != '\0')) { - uschar *dkim_verify_domains_expanded = - expand_string(dkim_verify_domains); - if (dkim_verify_domains_expanded == NULL) + uschar *dkim_verify_signers_expanded = + expand_string(dkim_verify_signers); + if (dkim_verify_signers_expanded == NULL) { log_write(0, LOG_MAIN|LOG_PANIC, - "expansion of dkim_verify_domains option failed: %s", + "expansion of dkim_verify_signers option failed: %s", expand_string_message); } else { int sep = 0; - uschar *ptr = dkim_verify_domains_expanded; + uschar *ptr = dkim_verify_signers_expanded; uschar *item = NULL; uschar itembuf[256]; while ((item = string_nextinlist(&ptr, &sep, -- 2.30.2