* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2023 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Functions for finding hosts, either by gethostbyname(), gethostbyaddr(), or
directly via the DNS. When IPv6 is supported, getipnodebyname() and
if (limit < 1)
return 0;
if (random_seed == 0)
- {
- if (f.running_in_test_harness) random_seed = 42; else
+ if (f.running_in_test_harness)
+ random_seed = 42;
+ else
{
int p = (int)getpid();
random_seed = (int)time(NULL) ^ ((p << 16) | p);
}
- }
random_seed = 1103515245 * random_seed + 12345;
return (unsigned int)(random_seed >> 16) % limit;
}
|| ipa == 6 && af == AF_INET6)
{
int x[4];
- yield = store_get(sizeof(struct hostent), FALSE);
- alist = store_get(2 * sizeof(char *), FALSE);
- adds = store_get(alen, FALSE);
+ yield = store_get(sizeof(struct hostent), GET_UNTAINTED);
+ alist = store_get(2 * sizeof(char *), GET_UNTAINTED);
+ adds = store_get(alen, GET_UNTAINTED);
yield->h_name = CS name;
yield->h_aliases = NULL;
yield->h_addrtype = af;
rr = dns_next_rr(dnsa, &dnss, RESET_NEXT)) if (rr->type == type)
count++;
- yield = store_get(sizeof(struct hostent), FALSE);
- alist = store_get((count + 1) * sizeof(char *), FALSE);
- adds = store_get(count *alen, FALSE);
+ yield = store_get(sizeof(struct hostent), GET_UNTAINTED);
+ alist = store_get((count + 1) * sizeof(char *), GET_UNTAINTED);
+ adds = store_get(count *alen, GET_UNTAINTED);
yield->h_name = CS name;
yield->h_aliases = NULL;
continue;
}
- h = store_get(sizeof(host_item), FALSE);
+ h = store_get(sizeof(host_item), GET_UNTAINTED);
h->name = name;
h->address = NULL;
h->port = PORT_NONE;
h->mx = fake_mx;
- h->sort_key = randomize? (-fake_mx)*1000 + random_number(1000) : 0;
+ h->sort_key = randomize ? (-fake_mx)*1000 + random_number(1000) : 0;
h->status = hstatus_unknown;
h->why = hwhy_unknown;
h->last_try = 0;
}
-
-
-
-/*************************************************
-* Extract port from address string *
-*************************************************/
-
-/* In the spool file, and in the -oMa and -oMi options, a host plus port is
-given as an IP address followed by a dot and a port number. This function
-decodes this.
-
-An alternative format for the -oMa and -oMi options is [ip address]:port which
-is what Exim 4 uses for output, because it seems to becoming commonly used,
-whereas the dot form confuses some programs/people. So we recognize that form
-too.
-
-Argument:
- address points to the string; if there is a port, the '.' in the string
- is overwritten with zero to terminate the address; if the string
- is in the [xxx]:ppp format, the address is shifted left and the
- brackets are removed
-
-Returns: 0 if there is no port, else the port number. If there's a syntax
- error, leave the incoming address alone, and return 0.
-*/
-
-int
-host_address_extract_port(uschar *address)
-{
-int port = 0;
-uschar *endptr;
-
-/* Handle the "bracketed with colon on the end" format */
-
-if (*address == '[')
- {
- uschar *rb = address + 1;
- while (*rb != 0 && *rb != ']') rb++;
- if (*rb++ == 0) return 0; /* Missing ]; leave invalid address */
- if (*rb == ':')
- {
- port = Ustrtol(rb + 1, &endptr, 10);
- if (*endptr != 0) return 0; /* Invalid port; leave invalid address */
- }
- else if (*rb != 0) return 0; /* Bad syntax; leave invalid address */
- memmove(address, address + 1, rb - address - 2);
- rb[-2] = 0;
- }
-
-/* Handle the "dot on the end" format */
-
-else
- {
- int skip = -3; /* Skip 3 dots in IPv4 addresses */
- address--;
- while (*(++address) != 0)
- {
- int ch = *address;
- if (ch == ':') skip = 0; /* Skip 0 dots in IPv6 addresses */
- else if (ch == '.' && skip++ >= 0) break;
- }
- if (*address == 0) return 0;
- port = Ustrtol(address + 1, &endptr, 10);
- if (*endptr != 0) return 0; /* Invalid port; leave invalid address */
- *address = 0;
- }
-
-return port;
-}
-
-
/*************************************************
* Get port from a host item's name *
*************************************************/
ident set, no host => U=ident
ident set, host set => H=sender_fullhost U=ident
-Use taint-unchecked routines on the assumption we'll never expand the results.
-
Arguments:
useflag TRUE if first item to be flagged (H= or U=); if there are two
items, the second is always flagged
-Returns: pointer to a string in big_buffer
+Returns: pointer to an allocated string
*/
uschar *
host_and_ident(BOOL useflag)
{
+gstring * g = NULL;
+
if (!sender_fullhost)
- string_format_nt(big_buffer, big_buffer_size, "%s%s", useflag ? "U=" : "",
- sender_ident ? sender_ident : US"unknown");
+ {
+ if (useflag)
+ g = string_catn(g, US"U=", 2);
+ g = string_cat(g, sender_ident ? sender_ident : US"unknown");
+ }
else
{
- uschar * flag = useflag ? US"H=" : US"";
- uschar * iface = US"";
+ if (useflag)
+ g = string_catn(g, US"H=", 2);
+ g = string_cat(g, sender_fullhost);
if (LOGGING(incoming_interface) && interface_address)
- iface = string_sprintf(" I=[%s]:%d", interface_address, interface_port);
+ g = string_fmt_append(g, " I=[%s]:%d", interface_address, interface_port);
if (sender_ident)
- string_format_nt(big_buffer, big_buffer_size, "%s%s%s U=%s",
- flag, sender_fullhost, iface, sender_ident);
- else
- string_format_nt(big_buffer, big_buffer_size, "%s%s%s",
- flag, sender_fullhost, iface);
+ g = string_fmt_append(g, " U=%s", sender_ident);
}
-return big_buffer;
+if (LOGGING(connection_id))
+ g = string_fmt_append(g, " Ci=%lu", connection_id);
+gstring_release_unused(g);
+return string_from_gstring(g);
}
#endif /* STAND_ALONE */
int sep = 0;
uschar *s;
ip_address_item * yield = NULL, * last = NULL, * next;
-BOOL taint = is_tainted(list);
while ((s = string_nextinlist(&list, &sep, NULL, 0)))
{
address above. The field in the ip_address_item is large enough to hold an
IPv6 address. */
- next = store_get(sizeof(ip_address_item), taint);
+ next = store_get(sizeof(ip_address_item), list);
next->next = NULL;
Ustrcpy(next->address, s);
next->port = port;
*/
uschar *
-host_ntoa(int type, const void *arg, uschar *buffer, int *portptr)
+host_ntoa(int type, const void * arg, uschar * buffer, int * portptr)
{
-uschar *yield;
+uschar * yield;
/* The new world. It is annoying that we have to fish out the address from
different places in the block, depending on what kind of address it is. It
struct sockaddr_in6 *sk = (struct sockaddr_in6 *)arg;
yield = US inet_ntop(family, &(sk->sin6_addr), CS addr_buffer,
sizeof(addr_buffer));
- if (portptr != NULL) *portptr = ntohs(sk->sin6_port);
+ if (portptr) *portptr = ntohs(sk->sin6_port);
}
else
{
struct sockaddr_in *sk = (struct sockaddr_in *)arg;
yield = US inet_ntop(family, &(sk->sin_addr), CS addr_buffer,
sizeof(addr_buffer));
- if (portptr != NULL) *portptr = ntohs(sk->sin_port);
+ if (portptr) *portptr = ntohs(sk->sin_port);
}
}
else
if (type < 0)
{
yield = US inet_ntoa(((struct sockaddr_in *)arg)->sin_addr);
- if (portptr != NULL) *portptr = ntohs(((struct sockaddr_in *)arg)->sin_port);
+ if (portptr) *portptr = ntohs(((struct sockaddr_in *)arg)->sin_port);
}
else
yield = US inet_ntoa(*((struct in_addr *)arg));
/* If there is no buffer, put the string into some new store. */
-if (!buffer) buffer = store_get(46, FALSE);
+if (!buffer) buffer = store_get(46, GET_UNTAINTED);
/* Callers of this function with a non-NULL buffer must ensure that it is
large enough to hold an IPv6 address, namely, at least 46 bytes. That's what
*/
int
-host_aton(const uschar *address, int *bin)
+host_aton(const uschar * address, int * bin)
{
int x[4];
int v4offset = 0;
if (Ustrchr(address, ':') != NULL)
{
- const uschar *p = address;
- const uschar *component[8];
+ const uschar * p = address;
+ const uschar * component[8];
BOOL ipv4_ends = FALSE;
- int ci = 0;
- int nulloffset = 0;
- int v6count = 8;
- int i;
+ int ci = 0, nulloffset = 0, v6count = 8, i;
/* If the address starts with a colon, it will start with two colons.
Just lose the first one, which will leave a null first component. */
overlooked; to guard against that happening again, check here and crash if
there are too many components. */
- while (*p != 0 && *p != '%')
+ while (*p && *p != '%')
{
int len = Ustrcspn(p, ":%");
if (len == 0) nulloffset = ci;
*/
int
-host_nmtoa(int count, int *binary, int mask, uschar *buffer, int sep)
+host_nmtoa(int count, const int * binary, int mask, uschar * buffer, int sep)
{
-int j;
-uschar *tt = buffer;
+uschar * tt = buffer;
if (count == 1)
- {
- j = binary[0];
- for (int i = 24; i >= 0; i -= 8)
+ for (int j = binary[0], i = 24; i >= 0; i -= 8)
tt += sprintf(CS tt, "%d.", (j >> i) & 255);
- }
else
- for (int i = 0; i < 4; i++)
+ for (int j, i = 0; i < 4; i++)
{
j = binary[i];
tt += sprintf(CS tt, "%04x%c%04x%c", (j >> 16) & 0xffff, sep, j & 0xffff, sep);
host_item *prev = NULL;
host_item *h;
-if (removed != NULL) *removed = FALSE;
+if (removed) *removed = FALSE;
-if (local_interface_data == NULL) local_interface_data = host_find_interfaces();
+if (!local_interface_data) local_interface_data = host_find_interfaces();
for (h = host; h != last->next; h = h->next)
{
- #ifndef STAND_ALONE
- if (hosts_treat_as_local != NULL)
+#ifndef STAND_ALONE
+ if (hosts_treat_as_local)
{
int rc;
- const uschar *save = deliver_domain;
+ const uschar * save = deliver_domain;
deliver_domain = h->name; /* set $domain */
rc = match_isinlist(string_copylc(h->name), CUSS &hosts_treat_as_local, 0,
&domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL);
deliver_domain = save;
if (rc == OK) goto FOUND_LOCAL;
}
- #endif
+#endif
/* It seems that on many operating systems, 0.0.0.0 is treated as a synonym
for 127.0.0.1 and refers to the local host. We therefore force it always to
be treated as local. */
- if (h->address != NULL)
+ if (h->address)
{
if (Ustrcmp(h->address, "0.0.0.0") == 0) goto FOUND_LOCAL;
for (ip_address_item * ip = local_interface_data; ip; ip = ip->next)
/* Update prev to point to the last host item before any that have
the same MX value as the one we have just considered. */
- if (h->next == NULL || h->next->mx != h->mx) prev = h;
+ if (!h->next || h->next->mx != h->mx)
+ prev = h;
}
return yield; /* No local hosts found: return HOST_FOUND or HOST_FIND_FAILED */
FOUND_LOCAL:
-if (prev == NULL)
+if (!prev)
{
HDEBUG(D_host_lookup) debug_printf((h->mx >= 0)?
"local host has lowest MX\n" :
debug_printf(" %s %s %d\n", h->name, h->address, h->mx);
}
-if (removed != NULL) *removed = TRUE;
+if (removed) *removed = TRUE;
prev->next = last->next;
*lastptr = prev;
return yield;
for (uschar ** aliases = USS hosts->h_aliases; *aliases; aliases++) count++;
store_pool = POOL_PERM;
- ptr = sender_host_aliases = store_get(count * sizeof(uschar *), FALSE);
+ ptr = sender_host_aliases = store_get(count * sizeof(uschar *), GET_UNTAINTED);
store_pool = POOL_TAINT_PERM;
for (uschar ** aliases = USS hosts->h_aliases; *aliases; aliases++)
int
host_name_lookup(void)
{
-int old_pool, rc;
-int sep = 0;
+int sep = 0, old_pool, rc, yield;
uschar *save_hostname;
uschar **aliases;
uschar *ordername;
HDEBUG(D_host_lookup)
debug_printf("looking up host name for %s\n", sender_host_address);
+expand_level++;
/* For testing the case when a lookup does not complete, we have a special
reserved IP address. */
HDEBUG(D_host_lookup)
debug_printf("Test harness: host name lookup returns DEFER\n");
host_lookup_deferred = TRUE;
- return DEFER;
+ yield = DEFER;
+ goto out;
}
/* Do lookups directly in the DNS or via gethostbyaddr() (or equivalent), in
/* Get store for the list of aliases. For compatibility with
gethostbyaddr, we make an empty list if there are none. */
- aptr = sender_host_aliases = store_get(count * sizeof(uschar *), FALSE);
+ aptr = sender_host_aliases = store_get(count * sizeof(uschar *), GET_UNTAINTED);
/* Re-scan and extract the names */
rr;
rr = dns_next_rr(dnsa, &dnss, RESET_NEXT)) if (rr->type == T_PTR)
{
- uschar * s = store_get(ssize, TRUE); /* names are tainted */
+ uschar * s = store_get(ssize, GET_TAINTED); /* names are tainted */
+ unsigned slen;
/* If an overlong response was received, the data will have been
truncated and dn_expand may fail. */
if (dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,
- US (rr->data), (DN_EXPAND_ARG4_TYPE)(s), ssize) < 0)
+ US rr->data, (DN_EXPAND_ARG4_TYPE)(s), ssize) < 0)
{
log_write(0, LOG_MAIN, "host name alias list truncated for %s",
sender_host_address);
break;
}
- store_release_above(s + Ustrlen(s) + 1);
- if (!s[0])
+ store_release_above(s + (slen = Ustrlen(s)) + 1);
+ if (!*s)
{
HDEBUG(D_host_lookup) debug_printf("IP address lookup yielded an "
"empty name: treated as non-existent host name\n");
continue;
}
+ if (Ustrspn(s, letter_digit_hyphen_dot) != slen)
+ {
+ HDEBUG(D_host_lookup) debug_printf("IP address lookup yielded an "
+ "illegal name (bad char): treated as non-existent host name\n");
+ continue;
+ }
if (!sender_host_name) sender_host_name = s;
else *aptr++ = s;
while (*s) { *s = tolower(*s); s++; }
HDEBUG(D_host_lookup)
debug_printf("IP address PTR lookup gave temporary error\n");
host_lookup_deferred = TRUE;
- return DEFER;
+ yield = DEFER;
+ goto out;
}
}
if (rc == DEFER)
{
host_lookup_deferred = TRUE;
- return rc; /* Can't carry on */
+ yield = rc; /* Can't carry on */
+ goto out;
}
if (rc == OK) break; /* Found a name */
}
"address %s", sender_host_address);
host_lookup_msg = US" (failed to find host name from IP address)";
host_lookup_failed = TRUE;
- return FAIL;
+ yield = FAIL;
+ goto out;
}
HDEBUG(D_host_lookup)
HDEBUG(D_host_lookup) debug_printf("temporary error for host name lookup\n");
host_lookup_deferred = TRUE;
sender_host_name = NULL;
- return DEFER;
+ yield = DEFER;
+ goto out;
}
else
HDEBUG(D_host_lookup) debug_printf("no IP addresses found for %s\n", hname);
/* If sender_host_name == NULL, it means we didn't like the name. Replace
it with the first alias, if there is one. */
-if (sender_host_name == NULL && *sender_host_aliases != NULL)
+if (!sender_host_name && *sender_host_aliases)
sender_host_name = *sender_host_aliases++;
/* If we now have a main name, all is well. */
-if (sender_host_name != NULL) return OK;
+if (sender_host_name) { yield = OK; goto out; }
/* We have failed to find an address that matches. */
sender_host_address, save_hostname);
store_pool = old_pool;
host_lookup_failed = TRUE;
-return FAIL;
+yield = FAIL;
+
+out:
+ expand_level--;
+ return yield;
}
else
{
- host_item *next = store_get(sizeof(host_item), FALSE);
+ host_item *next = store_get(sizeof(host_item), GET_UNTAINTED);
next->name = host->name;
#ifndef DISABLE_TLS
next->certname = host->certname;
if (!host->address)
{
uschar *msg =
- #ifndef STAND_ALONE
+#ifndef STAND_ALONE
!message_id[0] && smtp_in
? string_sprintf("no IP address found for host %s (during %s)", host->name,
smtp_get_connection_info()) :
- #endif
+#endif
string_sprintf("no IP address found for host %s", host->name);
HDEBUG(D_host_lookup) debug_printf("%s\n", msg);
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;
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;
- #endif
+#endif
host->address = host->name;
return HOST_FOUND;
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
)
i = 0; /* look up A records only */
else
- #endif /* STAND_ALONE */
+# endif /* STAND_ALONE */
i = 1; /* look up AAAA and A records */
/* Not a duplicate */
new_sort_key = host->mx * 1000 + random_number(500) + randoffset;
- next = store_get(sizeof(host_item), FALSE);
+ next = store_get(sizeof(host_item), GET_UNTAINTED);
/* New address goes first: insert the new block after the first one
(so as not to disturb the original pointer) but put the new address
*/
int
-host_find_bydns(host_item *host, const uschar *ignore_target_hosts, int whichrrs,
- uschar *srv_service, uschar *srv_fail_domains, uschar *mx_fail_domains,
- const dnssec_domains *dnssec_d,
- const uschar **fully_qualified_name, BOOL *removed)
+host_find_bydns(host_item * host, const uschar * ignore_target_hosts,
+ int whichrrs,
+ uschar * srv_service, uschar * srv_fail_domains, uschar * mx_fail_domains,
+ const dnssec_domains * dnssec_d,
+ const uschar ** fully_qualified_name, BOOL * removed)
{
-host_item *h, *last;
-int rc = DNS_FAIL;
-int ind_type = 0;
-int yield;
+host_item * h, * last;
+int rc = DNS_FAIL, ind_type = 0, yield;
dns_answer * dnsa = store_get_dns_answer();
dns_scan dnss;
-BOOL dnssec_require = dnssec_d
+BOOL dnssec_require, dnssec_request;
+dnssec_status_t dnssec;
+
+HDEBUG(D_host_lookup)
+ {
+ debug_printf_indent("check dnssec require list\n");
+ expand_level++;
+ }
+dnssec_require = dnssec_d
&& match_isinlist(host->name, CUSS &dnssec_d->require,
0, &domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) == OK;
-BOOL dnssec_request = dnssec_require
+
+HDEBUG(D_host_lookup)
+ {
+ expand_level--;
+ debug_printf_indent("check dnssec request list\n");
+ expand_level++;
+ }
+dnssec_request = dnssec_require
|| ( dnssec_d
&& match_isinlist(host->name, CUSS &dnssec_d->request,
0, &domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) == OK);
-dnssec_status_t dnssec;
+HDEBUG(D_host_lookup)
+ expand_level--;
/* Set the default fully qualified name to the incoming name, initialize the
resolver if necessary, set up the relevant options, and initialize the flag
that gets set for DNS syntax check errors. */
-if (fully_qualified_name != NULL) *fully_qualified_name = host->name;
+if (fully_qualified_name) *fully_qualified_name = host->name;
dns_init((whichrrs & HOST_FIND_QUALIFY_SINGLE) != 0,
(whichrrs & HOST_FIND_SEARCH_PARENTS) != 0,
dnssec_request);
if (whichrrs & HOST_FIND_BY_SRV)
{
- gstring * g;
- uschar * temp_fully_qualified_name;
+ uschar * s, * temp_fully_qualified_name;
int prefix_length;
- g = string_fmt_append(NULL, "_%s._tcp.%n%.256s",
+ s = string_sprintf("_%s._tcp.%n%.256s",
srv_service, &prefix_length, host->name);
- temp_fully_qualified_name = string_from_gstring(g);
+ temp_fully_qualified_name = s;
ind_type = T_SRV;
/* Search for SRV records. If the fully qualified name is different to
if ((dnssec_request || dnssec_require)
&& !dns_is_secure(dnsa)
&& dns_is_aa(dnsa))
- debug_printf("DNS lookup of %.256s (SRV) requested AD, but got AA\n", host->name);
+ debug_printf_indent("DNS lookup of %.256s (SRV) requested AD, but got AA\n", host->name);
if (dnssec_request)
{
{ dnssec = DS_NO; lookup_dnssec_authenticated = US"no"; }
}
- if (temp_fully_qualified_name != g->s && fully_qualified_name != NULL)
+ if (temp_fully_qualified_name != s && fully_qualified_name)
*fully_qualified_name = temp_fully_qualified_name + prefix_length;
/* On DNS failures, we give the "try again" error unless the domain is
&domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) != OK)
#endif
{ yield = HOST_FIND_AGAIN; goto out; }
- DEBUG(D_host_lookup) debug_printf("DNS_%s treated as DNS_NODATA "
+ DEBUG(D_host_lookup) debug_printf_indent("DNS_%s treated as DNS_NODATA "
"(domain in srv_fail_domains)\n", rc == DNS_FAIL ? "FAIL":"AGAIN");
}
}
if ( (dnssec_request || dnssec_require)
&& !dns_is_secure(dnsa)
&& dns_is_aa(dnsa))
- debug_printf("DNS lookup of %.256s (MX) requested AD, but got AA\n", host->name);
+ debug_printf_indent("DNS lookup of %.256s (MX) requested AD, but got AA\n", host->name);
if (dnssec_request)
if (dns_is_secure(dnsa))
{
- DEBUG(D_host_lookup) debug_printf("%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
switch (rc)
{
case DNS_NOMATCH:
- yield = HOST_FIND_FAILED; goto out;
+ yield = HOST_FIND_FAILED;
+ goto out;
case DNS_SUCCEED:
if (!dnssec_require || dns_is_secure(dnsa))
break;
DEBUG(D_host_lookup)
- debug_printf("dnssec fail on MX for %.256s", host->name);
+ debug_printf_indent("dnssec fail on MX for %.256s\n", host->name);
#ifndef STAND_ALONE
if (match_isinlist(host->name, CUSS &mx_fail_domains, 0,
&domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) != OK)
&domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) != OK)
#endif
{ yield = HOST_FIND_AGAIN; goto out; }
- DEBUG(D_host_lookup) debug_printf("DNS_%s treated as DNS_NODATA "
+ DEBUG(D_host_lookup) debug_printf_indent("DNS_%s treated as DNS_NODATA "
"(domain in mx_fail_domains)\n", (rc == DNS_FAIL)? "FAIL":"AGAIN");
break;
}
{
if (!(whichrrs & (HOST_FIND_BY_A | HOST_FIND_BY_AAAA)))
{
- DEBUG(D_host_lookup) debug_printf("Address records are not being sought\n");
+ DEBUG(D_host_lookup) debug_printf_indent("Address records are not being sought\n");
yield = HOST_FIND_FAILED;
goto out;
}
if (rc == HOST_FOUND)
rc = host_scan_for_local_hosts(host, &last, removed);
- else
- if (rc == HOST_IGNORED) rc = HOST_FIND_FAILED; /* No special action */
+ else if (rc == HOST_IGNORED)
+ rc = HOST_FIND_FAILED; /* No special action */
DEBUG(D_host_lookup)
if (host->address)
{
if (fully_qualified_name)
- debug_printf("fully qualified name = %s\n", *fully_qualified_name);
+ debug_printf_indent("fully qualified name = %s\n", *fully_qualified_name);
for (host_item * h = host; h != last->next; h = h->next)
- debug_printf("%s %s mx=%d sort=%d %s\n", h->name,
+ debug_printf_indent("%s %s mx=%d sort=%d %s\n", h->name,
h->address ? h->address : US"<null>", h->mx, h->sort_key,
h->status >= hstatus_unusable ? US"*" : US"");
}
const uschar * s = rr->data; /* MUST be unsigned for GETSHORT */
uschar data[256];
+ if (rr_bad_size(rr, sizeof(uint16_t))) continue;
GETSHORT(precedence, s); /* Pointer s is advanced */
/* For MX records, we use a random "weight" which causes multiple records of
/* SRV records are specified with a port and a weight. The weight is used
in a special algorithm. However, to start with, we just use it to order the
records of equal priority (precedence). */
+
+ if (rr_bad_increment(rr, s, 2 * sizeof(uint16_t))) continue;
GETSHORT(weight, s);
GETSHORT(port, s);
}
if (strcmpic(h->name, data) == 0)
{
DEBUG(D_host_lookup)
- debug_printf("discarded duplicate host %s (MX=%d)\n", data,
+ debug_printf_indent("discarded duplicate host %s (MX=%d)\n", data,
precedence > h->mx ? precedence : h->mx);
if (precedence >= h->mx) goto NEXT_MX_RR; /* Skip greater precedence */
if (h == host) /* Override first item */
/* Make a new host item and seek the correct insertion place */
{
int sort_key = precedence * 1000 + weight;
- host_item *next = store_get(sizeof(host_item), FALSE);
+ host_item * next = store_get(sizeof(host_item), GET_UNTAINTED);
next->name = string_copy_dnsdomain(data);
next->address = NULL;
next->port = port;
if (host == last && host->name[0] == 0)
{
- DEBUG(D_host_lookup) debug_printf("the single SRV record is \".\"\n");
+ DEBUG(D_host_lookup) debug_printf_indent("the single SRV record is \".\"\n");
yield = HOST_FIND_FAILED;
goto out;
}
DEBUG(D_host_lookup)
{
- debug_printf("original ordering of hosts from SRV records:\n");
+ debug_printf_indent("original ordering of hosts from SRV records:\n");
for (h = host; h != last->next; h = h->next)
- debug_printf(" %s P=%d W=%d\n", h->name, h->mx, h->sort_key % 1000);
+ debug_printf_indent(" %s P=%d W=%d\n", h->name, h->mx, h->sort_key % 1000);
}
for (pptr = &host, h = host; h != last; pptr = &h->next, h = h->next)
h->next = next;
*next = temp;
}
-#endif
+#endif /*HAVE_IPV6*/
/* Remove any duplicate IP addresses and then scan the list of hosts for any
whose IP addresses are on the local host. If any are found, all hosts with the
DEBUG(D_host_lookup)
{
if (fully_qualified_name)
- debug_printf("fully qualified name = %s\n", *fully_qualified_name);
- debug_printf("host_find_bydns yield = %s (%d); returned hosts:\n",
+ debug_printf_indent("fully qualified name = %s\n", *fully_qualified_name);
+ debug_printf_indent("host_find_bydns yield = %s (%d); returned hosts:\n",
yield == HOST_FOUND ? "HOST_FOUND" :
yield == HOST_FOUND_LOCAL ? "HOST_FOUND_LOCAL" :
yield == HOST_FIND_SECURITY ? "HOST_FIND_SECURITY" :
yield);
for (h = host; h != last->next; h = h->next)
{
- debug_printf(" %s %s MX=%d %s", h->name,
+ debug_printf_indent(" %s %s MX=%d %s", h->name,
!h->address ? US"<null>" : h->address, h->mx,
h->dnssec == DS_YES ? US"DNSSEC " : US"");
if (h->port != PORT_NONE) debug_printf("port=%d ", h->port);
git://git.exim.org / exim.git / blobdiff