From bb897ec1fd67859d84ba717f45689beab4a7dbe6 Mon Sep 17 00:00:00 2001 From: jbeich Date: Fri, 26 Oct 2018 00:31:00 +0000 Subject: dns/dnsdist: replace r482789 with upstream version Upstream chose more verbose fix via if() construct where indeterminate value takes false branch. Similar behavior to explict conversion. --- dns/dnsdist/files/patch-boost-1.69 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'dns') diff --git a/dns/dnsdist/files/patch-boost-1.69 b/dns/dnsdist/files/patch-boost-1.69 index f542b8d3b52b..2fcbe7f158f7 100644 --- a/dns/dnsdist/files/patch-boost-1.69 +++ b/dns/dnsdist/files/patch-boost-1.69 @@ -1,13 +1,16 @@ -https://github.com/PowerDNS/pdns/issues/7091 +https://github.com/PowerDNS/pdns/commit/d7a263770fea --- dnsdist-lua.cc.orig 2018-07-10 12:43:20 UTC +++ dnsdist-lua.cc -@@ -73,7 +73,7 @@ void setLuaSideEffect() +@@ -73,7 +73,10 @@ void setLuaSideEffect() bool getLuaNoSideEffect() { - return g_noLuaSideEffect==true; -+ return bool{g_noLuaSideEffect}; ++ if (g_noLuaSideEffect) { ++ return true; ++ } ++ return false; } void resetLuaSideEffect() -- cgit