projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4' into collectd-4.5
[collectd.git]
/
src
/
utils_dns.c
diff --git
a/src/utils_dns.c
b/src/utils_dns.c
index
b72cd5c
..
c16ca52
100644
(file)
--- a/
src/utils_dns.c
+++ b/
src/utils_dns.c
@@
-385,13
+385,13
@@
handle_dns(const char *buf, int len,
if (0 != x)
return 0;
if ('\0' == qh.qname[0])
if (0 != x)
return 0;
if ('\0' == qh.qname[0])
- s
trcpy(qh.qname, "."
);
+ s
strncpy (qh.qname, ".", sizeof (qh.qname)
);
while ((t = strchr(qh.qname, '\n')))
*t = ' ';
while ((t = strchr(qh.qname, '\r')))
*t = ' ';
for (t = qh.qname; *t; t++)
while ((t = strchr(qh.qname, '\n')))
*t = ' ';
while ((t = strchr(qh.qname, '\r')))
*t = ' ';
for (t = qh.qname; *t; t++)
- *t = tolower(*t);
+ *t = tolower(
(int)
*t);
memcpy(&us, buf + offset, 2);
qh.qtype = ntohs(us);
memcpy(&us, buf + offset, 2);
qh.qtype = ntohs(us);
@@
-705,7
+705,7
@@
const char *qtype_str(int t)
{
static char buf[32];
switch (t) {
{
static char buf[32];
switch (t) {
-#if (defined (__NAMESER)) && (__NAMESER >= 1999100
6
)
+#if (defined (__NAMESER)) && (__NAMESER >= 1999100
1
)
case ns_t_a: return ("A");
case ns_t_ns: return ("NS");
case ns_t_md: return ("MD");
case ns_t_a: return ("A");
case ns_t_ns: return ("NS");
case ns_t_md: return ("MD");
@@
-747,7
+747,9
@@
const char *qtype_str(int t)
case ns_t_dname: return ("DNAME");
case ns_t_sink: return ("SINK");
case ns_t_opt: return ("OPT");
case ns_t_dname: return ("DNAME");
case ns_t_sink: return ("SINK");
case ns_t_opt: return ("OPT");
+# if __NAMESER >= 19991006
case ns_t_tsig: return ("TSIG");
case ns_t_tsig: return ("TSIG");
+# endif
case ns_t_ixfr: return ("IXFR");
case ns_t_axfr: return ("AXFR");
case ns_t_mailb: return ("MAILB");
case ns_t_ixfr: return ("IXFR");
case ns_t_axfr: return ("AXFR");
case ns_t_mailb: return ("MAILB");