Fix dkim_signers condition logic / Renamed dkim_signing_domains to dkim_signers

[exim.git] / src / src / acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index 04b7fe5f59bd59b1f730908744e4446f0791ea4f..7bcec314dba7c0994ee1b4af039dc67d45c99ff2 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.84 2009/10/14 14:48:41 nm4 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.85 2009/10/15 08:06:23 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -2789,20 +2789,11 @@ for (; cb != NULL; cb = cb->next)
 
     #ifndef DISABLE_DKIM
     case ACLC_DKIM_SIGNER:
-    if (dkim_signing_domain != NULL)
-      {
-      rc = match_isinlist(dkim_signing_domain,
+    if (dkim_cur_signer != NULL)
+      rc = match_isinlist(dkim_cur_signer,
                           &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
-      if (rc == FAIL)
-        {
-        rc = match_isinlist(dkim_exim_expand_query(DKIM_IDENTITY),
-                            &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
-        }
-      }
     else
-      {
        rc = FAIL;
-      }
     break;
 
     case ACLC_DKIM_STATUS: