X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1f791335fa63a062b191c4d51cb902b3991de65b..0e8aed8aab2d2b68d1f6e6b0b2985de2bd6d2a73:/src/src/deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 34f36cd33..c35f3fa5b 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -1553,7 +1553,7 @@ if (addr->return_file >= 0 && addr->return_filename)
           log_write(0, LOG_MAIN, "<%s>: %s transport output: %s",
             addr->address, tb->name, sp);
           }
-        (void)fclose(f);
+      (void)fclose(f);
       }
 
     /* Handle returning options, but only if there is an address to return
@@ -7720,9 +7720,10 @@ wording. */
 	    addr->address);
         if ((hu = addr->host_used) && hu->name)
 	  {
-	  const uschar * s;
 	  fprintf(f, "Remote-MTA: dns; %s\n", hu->name);
 #ifdef EXPERIMENTAL_DSN_INFO
+	  {
+	  const uschar * s;
 	  if (hu->address)
 	    {
 	    uschar * p = hu->port == 25
@@ -7735,6 +7736,7 @@ wording. */
 	    fprintf(f, "X-Remote-MTA-helo-response: X-str; %s\n", s);
 	  if ((s = addr->message) && *s)
 	    fprintf(f, "X-Exim-Diagnostic: X-str; %s\n", s);
+	  }
 #endif
 	  print_dsn_diagnostic_code(addr, f);
 	  }