exim_msgdate: more options, better perl version compatibility

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

diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index e04917ca5f8571dd05c232da1d4647427a75b22e..9c5e8eb33d9aa00e83807baa5900275682dbd546 100644 (file)
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -5,6 +5,7 @@
 /* Copyright (c) The Exim Maintainers 2020 - 2022 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 /* Copyright (c) The Exim Maintainers 2020 - 2022 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */

+/* SPDX-License-Identifier: GPL-2.0-or-later */

 
 /* Functions for writing spool files, and moving them about. */
 
 
 /* Functions for writing spool files, and moving them about. */
 


@@ -191,7 +192,7 @@ if (sender_helo_name) spool_var_write(fp, US"helo_name", sender_helo_name);
 if (sender_host_address)
   {
   if (is_tainted(sender_host_address)) putc('-', fp);
 if (sender_host_address)
   {
   if (is_tainted(sender_host_address)) putc('-', fp);

-  fprintf(fp, "-host_address %s.%d\n", sender_host_address, sender_host_port);
+  fprintf(fp, "-host_address [%s]:%d\n", sender_host_address, sender_host_port);

   if (sender_host_name)
     spool_var_write(fp, US"host_name", sender_host_name);
   }
   if (sender_host_name)
     spool_var_write(fp, US"host_name", sender_host_name);
   }


@@ -205,7 +206,7 @@ if (sender_host_auth_pubname)
 if (interface_address)
   {
   if (is_tainted(interface_address)) putc('-', fp);
 if (interface_address)
   {
   if (is_tainted(interface_address)) putc('-', fp);

-  fprintf(fp, "-interface_address %s.%d\n", interface_address, interface_port);
+  fprintf(fp, "-interface_address [%s]:%d\n", interface_address, interface_port);

   }
 
 if (smtp_active_hostname != primary_hostname)
   }
 
 if (smtp_active_hostname != primary_hostname)


@@ -230,6 +231,12 @@ tree_walk(acl_var_m, &acl_var_write, fp);
 
 /* Now any other data that needs to be remembered. */
 
 
 /* Now any other data that needs to be remembered. */
 

+if (*debuglog_name)
+  {
+  fprintf(fp, "-debug_selector 0x%x\n", debug_selector);
+  fprintf(fp, "-debuglog_name %s\n", debuglog_name);
+  }
+

 if (f.spool_file_wireformat)
   fprintf(fp, "-spool_file_wireformat\n");
 else
 if (f.spool_file_wireformat)
   fprintf(fp, "-spool_file_wireformat\n");
 else