From 677aa52dd615f366754120bad5fdea32c9509d17 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Thu, 14 Nov 2013 21:43:34 +0200 Subject: [PATCH] Fixed few nits --- pdns/resolver.cc | 8 +++++--- regression-tests/check_stest_source | 8 +++++--- regression-tests/start-test-stop | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pdns/resolver.cc b/pdns/resolver.cc index fbf9fae5f8..582ad7b0d4 100644 --- a/pdns/resolver.cc +++ b/pdns/resolver.cc @@ -102,9 +102,10 @@ catch(...) { Resolver::~Resolver() { - for(std::map::iterator iter = locals.begin(); iter != locals.end(); iter++) { - close(iter->second); - } + for(std::map::iterator iter = locals.begin(); iter != locals.end(); iter++) { + if (iter->second >= 0) + close(iter->second); + } } uint16_t Resolver::sendResolve(const ComboAddress& remote, const ComboAddress& local, @@ -152,6 +153,7 @@ uint16_t Resolver::sendResolve(const ComboAddress& remote, const ComboAddress& l } else { // try to make socket sock = makeQuerySocket(local, true); + Utility::setNonBlocking( sock ); locals[lstr] = sock; } } diff --git a/regression-tests/check_stest_source b/regression-tests/check_stest_source index b7d3bf1a6e..57aa58dc28 100644 --- a/regression-tests/check_stest_source +++ b/regression-tests/check_stest_source @@ -1,7 +1,9 @@ function prequery ( dnspacket ) qname, qtype = dnspacket:getQuestion() remote = dnspacket:getRemote() - if qname == "stest.com" and remote != "127.0.0.2": - return false - return true + if qname == "stest.com" and remote ~= "127.0.0.2" then + dnspacket:setRcode(pdns.NXDOMAIN) + return true + end + return false end diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index f146523cd2..3938a659be 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -929,7 +929,7 @@ EOF esac if [ "$skiplua" == "1" ]; then - skipreasons="$skipreaasons nolua" + skipreasons="$skipreasons nolua" fi check_process -- 2.47.2