Use dsn_from for success-DSN messages. Bug 2404

[user/henk/code/exim.git] / src / src / buildconfig.c

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 3d404f100865e59e6519a2ee3f7e25d248ad4fa0..71cf97b18d34e6821022890ffae3c666a4bc94f7 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -753,15 +753,15 @@ else if (isgroup)
     continue;
     }
 
-  /* DISABLE_DKIM is special; must be forced if no SUPPORT_TLS */
+  /* DISABLE_DKIM is special; must be forced if DISABLE_TLS */
   if (strcmp(name, "DISABLE_DKIM") == 0)
     {
     char *d_dkim = getenv("DISABLE_DKIM");
-    char *tls = getenv("SUPPORT_TLS");
+    char *notls = getenv("DISABLE_TLS");
 
     if (d_dkim)
       fprintf(new, "#define DISABLE_DKIM          yes\n");
-    else if (!tls)
+    else if (notls)
       fprintf(new, "#define DISABLE_DKIM          yes /* forced by lack of TLS */\n");
     else
       fprintf(new, "/* DISABLE_DKIM not set */\n");
@@ -953,21 +953,18 @@ else if (isgroup)
 defined. */
 
 if (have_auth)
-  {
   if (!support_crypteq) fprintf(new, "/* Force SUPPORT_CRYPTEQ for AUTH */\n"
     "#define SUPPORT_CRYPTEQ\n");
-  }
 
 /* Check poll() for timer functionality.
 Some OS' have released with it broken. */
 
   {
   struct timeval before, after;
-  int rc;
   size_t us;
 
   gettimeofday(&before, NULL);
-  rc = poll(NULL, 0, 500);
+  (void) poll(NULL, 0, 500);
   gettimeofday(&after, NULL);
 
   us = (after.tv_sec - before.tv_sec) * 1000000 +