From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 30 Sep 2019 11:20:43 +0000 (+0200)
Subject: lua bindings: fix a regression from b42195a2
X-Git-Tag: v4.2.2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35258d44034dc00b5af95d5da2f55a03a262c4c1;p=thirdparty%2Fknot-resolver.git

lua bindings: fix a regression from b42195a2

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.
---

diff --git a/NEWS b/NEWS
index 8c1360ddb..00f632349 100644
--- 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)
 ================================
 
diff --git a/daemon/lua/kres.lua b/daemon/lua/kres.lua
index 5198c2fcd..8dc7b9cf3 100644
--- a/daemon/lua/kres.lua
+++ b/daemon/lua/kres.lua
@@ -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;