build: use pkg-config for i18n

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

diff --git a/src/src/host.c b/src/src/host.c
index 26b3c2c68fe08f161d7c8a2c37d37f92b80e372a..742cfec4803ca26d17d7866c60fb3806b25a78e1 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) The Exim Maintainers 2020 - 2023 */
+/* Copyright (c) The Exim Maintainers 2020 - 2024 */

 /* 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 */
 /* 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 */


@@ -629,7 +629,7 @@ else
     g = string_fmt_append(g, " U=%s", sender_ident);
   }
 if (LOGGING(connection_id))
     g = string_fmt_append(g, " U=%s", sender_ident);
   }
 if (LOGGING(connection_id))

-  g = string_fmt_append(g, " Ci=%lu", connection_id);
+  g = string_fmt_append(g, " Ci=%s", connection_id);

 gstring_release_unused(g);
 return string_from_gstring(g);
 }
 gstring_release_unused(g);
 return string_from_gstring(g);
 }


@@ -737,7 +737,7 @@ add_unique_interface(ip_address_item *list, ip_address_item *ipa)
 ip_address_item *ipa2;
 for (ipa2 = list; ipa2; ipa2 = ipa2->next)
   if (Ustrcmp(ipa2->address, ipa->address) == 0) return list;
 ip_address_item *ipa2;
 for (ipa2 = list; ipa2; ipa2 = ipa2->next)
   if (Ustrcmp(ipa2->address, ipa->address) == 0) return list;

-ipa2 = store_get_perm(sizeof(ip_address_item), FALSE);
+ipa2 = store_get_perm(sizeof(ip_address_item), GET_UNTAINTED);

 *ipa2 = *ipa;
 ipa2->next = list;
 return ipa2;
 *ipa2 = *ipa;
 ipa2->next = list;
 return ipa2;


@@ -2204,7 +2204,7 @@ set_address_from_dns(host_item *host, host_item **lastptr,
   const uschar **fully_qualified_name,
   BOOL dnssec_request, BOOL dnssec_require, int whichrrs)
 {
   const uschar **fully_qualified_name,
   BOOL dnssec_request, BOOL dnssec_require, int whichrrs)
 {

-host_item *thishostlast = NULL;    /* Indicates not yet filled in anything */
+host_item * thishostlast = NULL;    /* Indicates not yet filled in anything */

 BOOL v6_find_again = FALSE;
 BOOL dnssec_fail = FALSE;
 int i;
 BOOL v6_find_again = FALSE;
 BOOL dnssec_fail = FALSE;
 int i;


@@ -2223,12 +2223,12 @@ those sites that feel they have to flaunt the RFC rules. */
 
 if (allow_ip && string_is_ip_address(host->name, NULL) != 0)
   {
 
 if (allow_ip && string_is_ip_address(host->name, NULL) != 0)
   {

-  #ifndef STAND_ALONE
+#ifndef STAND_ALONE

   if (  ignore_target_hosts
      && verify_check_this_host(&ignore_target_hosts, NULL, host->name,
         host->name, NULL) == OK)
     return HOST_IGNORED;
   if (  ignore_target_hosts
      && verify_check_this_host(&ignore_target_hosts, NULL, host->name,
         host->name, NULL) == OK)
     return HOST_IGNORED;

-  #endif
+#endif

 
   host->address = host->name;
   return HOST_FOUND;
 
   host->address = host->name;
   return HOST_FOUND;


@@ -2242,7 +2242,7 @@ testing, we force an IPv4 lookup if the domain matches dns_ipv4_lookup global.
 On an IPv4 system, go round the loop once only, looking only for A records. */
 
 #if HAVE_IPV6
 On an IPv4 system, go round the loop once only, looking only for A records. */
 
 #if HAVE_IPV6

-  #ifndef STAND_ALONE
+# ifndef STAND_ALONE

     if (  disable_ipv6
        || !(whichrrs & HOST_FIND_BY_AAAA)
        ||    dns_ipv4_lookup
     if (  disable_ipv6
        || !(whichrrs & HOST_FIND_BY_AAAA)
        ||    dns_ipv4_lookup


@@ -2251,7 +2251,7 @@ On an IPv4 system, go round the loop once only, looking only for A records. */
        )
       i = 0;    /* look up A records only */
     else
        )
       i = 0;    /* look up A records only */
     else

-  #endif        /* STAND_ALONE */
+# endif        /* STAND_ALONE */

 
   i = 1;        /* look up AAAA and A records */
 
 
   i = 1;        /* look up AAAA and A records */
 


@@ -2628,7 +2628,8 @@ if (rc != DNS_SUCCEED  &&  whichrrs & HOST_FIND_BY_MX)
   if (dnssec_request)
     if (dns_is_secure(dnsa))
       {
   if (dnssec_request)
     if (dns_is_secure(dnsa))
       {

-      DEBUG(D_host_lookup) debug_printf_indent("%s (MX resp) DNSSEC\n", host->name);
+      DEBUG(D_host_lookup)
+       debug_printf_indent("%s (MX resp) DNSSEC\n", host->name);

       dnssec = DS_YES; lookup_dnssec_authenticated = US"yes";
       }
     else
       dnssec = DS_YES; lookup_dnssec_authenticated = US"yes";
       }
     else