diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-10 18:41:03 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-10 18:41:03 +0000 |
commit | e841e92ec9f434377d37fcb5594eded0f799d61f (patch) | |
tree | 0963557bfff27269a5efe726c81cbb8e5b494989 | |
parent | bcd00cfde726bd2c1dcd20ce8d4ad71c9dbf87cb (diff) |
Merged revisions 74374 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10133)
................
r74374 | qwell | 2007-07-10 13:39:30 -0500 (Tue, 10 Jul 2007) | 13 lines
Merged revisions 74373 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r74373 | qwell | 2007-07-10 13:37:23 -0500 (Tue, 10 Jul 2007) | 5 lines
Use res_ndestroy on systems that have it. Otherwise, use res_nclose.
This prevents a memleak on NetBSD - and possibly others.
Issue 10133, patch by me, reported and tested by scw
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@74375 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | configure | 55 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
-rw-r--r-- | main/dns.c | 4 |
4 files changed, 70 insertions, 2 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 73911 . +# From configure.ac Revision: 74212 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -15783,6 +15783,59 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_RES_NINIT 1 _ACEOF + { echo "$as_me:$LINENO: checking for res_ndestroy" >&5 +echo $ECHO_N "checking for res_ndestroy... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <resolv.h> +int +main () +{ +int foo = res_ndestroy(NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_RES_NDESTROY 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 diff --git a/configure.ac b/configure.ac index 4766e5608..081a5e35a 100644 --- a/configure.ac +++ b/configure.ac @@ -351,7 +351,15 @@ AC_LINK_IFELSE( AC_LANG_PROGRAM([#include <resolv.h>], [int foo = res_ninit(NULL);]), AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]), + AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]) + AC_MSG_CHECKING(for res_ndestroy) + AC_LINK_IFELSE( + AC_LANG_PROGRAM([#include <resolv.h>], + [int foo = res_ndestroy(NULL);]), + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_RES_NDESTROY], 1, [Define to 1 if your system has the ndestroy resolver function.]), + AC_MSG_RESULT(no) + ), AC_MSG_RESULT(no) ) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 42da34d38..f4052cc81 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -424,6 +424,9 @@ /* Define to 1 if you have the `regcomp' function. */ #undef HAVE_REGCOMP +/* Define to 1 if your system has the ndestroy resolver function. */ +#undef HAVE_RES_NDESTROY + /* Define to 1 if your system has the re-entrant resolver functions. */ #undef HAVE_RES_NINIT diff --git a/main/dns.c b/main/dns.c index bb7827226..d92243561 100644 --- a/main/dns.c +++ b/main/dns.c @@ -229,7 +229,11 @@ int ast_search_dns(void *context, ret = 1; } #ifdef HAVE_RES_NINIT +#if HAVE_RES_NDESTROY + res_ndestroy(&dnsstate); +#else res_nclose(&dnsstate); +#endif #else #ifndef __APPLE__ res_close(); |