]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
lua bindings: fix a regression from b42195a2
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 30 Sep 2019 11:20:43 +0000 (13:20 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Wed, 2 Oct 2019 13:16:38 +0000 (15:16 +0200)
I'm really sorry; I didn't notice and it only hit parts that
*apparently* aren't tested normally.  Only 32-bit systems would be
affected, due to the structure only changing ABI on 32-bit systems.

NEWS
daemon/lua/kres.lua

diff --git a/NEWS b/NEWS
index 8c1360ddbdd8a6ed8ef9b442a556de278b7f59fc..00f63234946e94d3136e3a8907eea7c388db11e3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Knot Resolver 4.2.2 (2019-10-dd)
+================================
+
+Bugfixes
+--------
+- lua bindings: fix a 4.2.1 regression on 32-bit systems (#514)
+  which also fixes libknot 2.9 support on all systems
+
+
 Knot Resolver 4.2.1 (2019-09-26)
 ================================
 
index 5198c2fcd0791ce5b9cacbf2cca1b06493c967ee..8dc7b9cf38af67bb20d3581c451f7b1bc6166cb6 100644 (file)
@@ -65,14 +65,14 @@ if not sover_pos then
        error('unexpected libknot soname: ' .. libknot_SONAME)
 end
 local sover = string.sub(libknot_SONAME, sover_pos , sover_pos)
-if sover == '8' then
+if sover == '9' then
        knot_rdataset_t_cdef = [[
                typedef struct {
                        uint16_t count;
                        knot_rdata_t *rdata;
                } knot_rdataset_t;
        ]]
-elseif sover == '9' then
+elseif sover == '1' then -- it's 10 really, but this is simpler
        knot_rdataset_t_cdef = [[
                typedef struct {
                        uint16_t count;