0d416a1cc0
With this new version of zabbix we do not need uname and hostname anymore, see https://svn.zabbix.com/browse/ZBX-5616 Only compile tested for now Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr> git-svn-id: svn://svn.openwrt.org/openwrt/packages@39489 3c298f89-4303-0410-b956-a3cf2f4a3e73
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -151,6 +151,10 @@ if test "x$found_resolv" != "xyes"; then
|
|
AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)])
|
|
fi
|
|
LIBS="${LIBS} ${RESOLV_LIBS}"
|
|
+AC_SEARCH_LIBS([res_mkquery], [], [AC_DEFINE([HAVE_RES_MKQUERY], 1, [Define if res_mkquery exists])])
|
|
+AC_SEARCH_LIBS([__res_mkquery], [], [AC_DEFINE([HAVE_RES_MKQUERY], 1, [Define if res_mkquery exists])])
|
|
+AC_SEARCH_LIBS([res_send], [], [AC_DEFINE([HAVE_RES_SEND], 1, [Define if res_send exists])])
|
|
+AC_SEARCH_LIBS([__res_send], [], [AC_DEFINE([HAVE_RES_SEND], 1, [Define if res_send exists])])
|
|
|
|
dnl *****************************************************************
|
|
dnl * *
|
|
--- a/src/libs/zbxsysinfo/common/net.c
|
|
+++ b/src/libs/zbxsysinfo/common/net.c
|
|
@@ -421,6 +421,7 @@ static int dns_query(AGENT_REQUEST *requ
|
|
#else /* not _WINDOWS */
|
|
res_init(); /* initialize always, settings might have changed */
|
|
|
|
+#if defined(HAVE_RES_MKQUERY) && defined(HAVE_RES_SEND)
|
|
if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
|
|
return SYSINFO_RET_FAIL;
|
|
|
|
@@ -439,6 +440,11 @@ static int dns_query(AGENT_REQUEST *requ
|
|
_res.retry = retry;
|
|
|
|
res = res_send(buf, res, answer.buffer, sizeof(answer.buffer));
|
|
+#else /* defined(HAVE_RES_QUERY) && defined(HAVE_RES_SEND) */
|
|
+ /* retrand and retry are ignored */
|
|
+ if (-1 == (res = res_query(zone, C_IN, type, answer.buffer, sizeof(answer.buffer))))
|
|
+ return SYSINFO_RET_FAIL;
|
|
+#endif
|
|
|
|
hp = (HEADER *)answer.buffer;
|
|
|