X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fbuildconfig.c;h=45e820c81b850d313fc4f1bfbc3000f8fa929851;hb=f444c2c7e41c8a2b43b6270708e7eb88831f11e0;hp=f3390cb7513bfb91f9f3861811bbc28196ab4819;hpb=b81207d2bfa92b2a666b01ce64c1b5e06a4a2098;p=exim.git

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index f3390cb75..45e820c81 100644
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -734,6 +734,21 @@ else if (isgroup)
     continue;
     }
 
+  /* DISABLE_DKIM is special; must be forced if no SUPPORT_TLS */
+  if (strcmp(name, "DISABLE_DKIM") == 0)
+    {
+    char *d_dkim = getenv("DISABLE_DKIM");
+    char *tls = getenv("SUPPORT_TLS");
+
+    if (d_dkim)
+      fprintf(new, "#define DISABLE_DKIM          yes\n");
+    else if (!tls)
+      fprintf(new, "#define DISABLE_DKIM          yes /* forced by lack of TLS */\n");
+    else
+      fprintf(new, "/* DISABLE_DKIM not set */\n");
+    continue;
+    }
+
   /* Otherwise, check whether a value exists in the environment. Remember if
   it is an AUTH setting or SUPPORT_CRYPTEQ. */