mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 00:25:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Master

See merge request isc-projects/bind9!36
This commit is contained in:
Ondřej Surý
2018-02-16 17:19:26 -05:00
parent c6b430745b 2a70eae04f
commit 4801f40e4d
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/dlz/config.dlz.in
View File

@@ -152,23 +152,11 @@ then
then then
use_dlz_mysql=$d use_dlz_mysql=$d
mysql_include=$d/include/mysql mysql_include=$d/include/mysql
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
break break
elif test -f $d/include/mysql.h elif test -f $d/include/mysql.h
then then
use_dlz_mysql=$d use_dlz_mysql=$d
mysql_include=$d/include mysql_include=$d/include
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
break break
fi fi
done done
@@ -179,21 +167,9 @@ then
if test -f $d/include/mysql/mysql.h if test -f $d/include/mysql/mysql.h
then then
mysql_include=$d/include/mysql mysql_include=$d/include/mysql
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
elif test -f $d/include/mysql.h elif test -f $d/include/mysql.h
then then
mysql_include=$d/include mysql_include=$d/include
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
fi fi
fi fi
@@ -217,6 +193,12 @@ case "$use_dlz_mysql" in
[using mysql with libs ${mysql_lib} and includes ${mysql_include}]) [using mysql with libs ${mysql_lib} and includes ${mysql_include}])
;; ;;
*) *)
if test -d "$use_dlz_mysql/lib/mysql"
then
mysql_lib="$use_dlz_mysql/lib/mysql"
else
mysql_lib="$use_dlz_mysql/lib"
fi
DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver, DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
[-I${mysql_include}], [-I${mysql_include}],
[-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm]) [-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])

10
lib/dns/resolver.c
View File

@@ -3970,10 +3970,7 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) {
if (addrinfo == NULL) { if (addrinfo == NULL) {
/* We have no more addresses. Start over. */ /* We have no more addresses. Start over. */
fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE); fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
fctx_cleanupfinds(fctx); fctx_cleanupall(fctx);
fctx_cleanupaltfinds(fctx);
fctx_cleanupforwaddrs(fctx);
fctx_cleanupaltaddrs(fctx);
result = fctx_getaddresses(fctx, badcache); result = fctx_getaddresses(fctx, badcache);
if (result == DNS_R_WAIT) { if (result == DNS_R_WAIT) {
/* /*
@@ -9028,10 +9025,7 @@ rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo,
fctx->ns_ttl = fctx->nameservers.ttl; fctx->ns_ttl = fctx->nameservers.ttl;
fctx->ns_ttl_ok = ISC_TRUE; fctx->ns_ttl_ok = ISC_TRUE;
fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE); fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
fctx_cleanupfinds(fctx); fctx_cleanupall(fctx);
fctx_cleanupaltfinds(fctx);
fctx_cleanupforwaddrs(fctx);
fctx_cleanupaltaddrs(fctx);
} }
/* /*