projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up compiler warnings from { gcc -Wall }, many of which I introduced with
[exim.git]
/
src
/
src
/
dns.c
diff --git
a/src/src/dns.c
b/src/src/dns.c
index 0b1d59d2006f709988fc064201657369e2874a16..dcafdb84aee1d197021d49e429c4b17098a23354 100644
(file)
--- a/
src/src/dns.c
+++ b/
src/src/dns.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/dns.c,v 1.
17 2007/01/08 10:50:18 ph10
Exp $ */
+/* $Cambridge: exim/src/src/dns.c,v 1.
21 2009/11/16 19:50:36 nm4
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
7
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for interfacing with the DNS. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for interfacing with the DNS. */
@@
-462,8
+462,8
@@
Returns: DNS_SUCCEED successful lookup
int
dns_basic_lookup(dns_answer *dnsa, uschar *name, int type)
{
int
dns_basic_lookup(dns_answer *dnsa, uschar *name, int type)
{
-int rc = -1;
#ifndef STAND_ALONE
#ifndef STAND_ALONE
+int rc = -1;
uschar *save;
#endif
uschar *save;
#endif
@@
-505,7
+505,7
@@
For SRV records, we omit the initial _smtp._tcp. components at the start. */
#ifndef STAND_ALONE /* Omit this for stand-alone tests */
#ifndef STAND_ALONE /* Omit this for stand-alone tests */
-if (check_dns_names_pattern[0] != 0 && type != T_PTR)
+if (check_dns_names_pattern[0] != 0 && type != T_PTR
&& type != T_TXT
)
{
uschar *checkname = name;
int ovector[3*(EXPAND_MAXN+1)];
{
uschar *checkname = name;
int ovector[3*(EXPAND_MAXN+1)];
@@
-562,7
+562,12
@@
if (running_in_test_harness)
else
dnsa->answerlen = res_search(CS name, C_IN, type, dnsa->answer, MAXPACKET);
else
dnsa->answerlen = res_search(CS name, C_IN, type, dnsa->answer, MAXPACKET);
-if (dnsa->answerlen > MAXPACKET) dnsa->answerlen = MAXPACKET;
+if (dnsa->answerlen > MAXPACKET)
+ {
+ DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) resulted in overlong packet (size %d), truncating to %d.\n",
+ name, dns_text_type(type), dnsa->answerlen, MAXPACKET);
+ dnsa->answerlen = MAXPACKET;
+ }
if (dnsa->answerlen < 0) switch (h_errno)
{
if (dnsa->answerlen < 0) switch (h_errno)
{