From e7a93321f095c8a2018df253a38bd1fc40d639cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Wed, 17 Jan 2018 19:43:12 +0100 Subject: [PATCH 1/2] Reuse new function from rt46864 for similar block elsewhere. --- lib/dns/resolver.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 32bd83f6cf..8683d5333e 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -3970,10 +3970,7 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) { if (addrinfo == NULL) { /* We have no more addresses. Start over. */ fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE); - fctx_cleanupfinds(fctx); - fctx_cleanupaltfinds(fctx); - fctx_cleanupforwaddrs(fctx); - fctx_cleanupaltaddrs(fctx); + fctx_cleanupall(fctx); result = fctx_getaddresses(fctx, badcache); 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_ok = ISC_TRUE; fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE); - fctx_cleanupfinds(fctx); - fctx_cleanupaltfinds(fctx); - fctx_cleanupforwaddrs(fctx); - fctx_cleanupaltaddrs(fctx); + fctx_cleanupall(fctx); } /* From 2a70eae04f901e13df814fc8b67b030d46cf90c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Thu, 15 Feb 2018 12:48:56 +0100 Subject: [PATCH 2/2] Reduce repeated detection of mysql lib directory. Use common part once a bit later. --- contrib/dlz/config.dlz.in | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in index 5d65a85739..47525af85b 100644 --- a/contrib/dlz/config.dlz.in +++ b/contrib/dlz/config.dlz.in @@ -152,23 +152,11 @@ then then use_dlz_mysql=$d mysql_include=$d/include/mysql - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi break elif test -f $d/include/mysql.h then use_dlz_mysql=$d mysql_include=$d/include - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi break fi done @@ -179,21 +167,9 @@ then if test -f $d/include/mysql/mysql.h then 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 then mysql_include=$d/include - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi fi fi @@ -217,6 +193,12 @@ case "$use_dlz_mysql" in [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, [-I${mysql_include}], [-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])