[v9_9] fixed clientinfo version check

3466.	[contrib]	Corrected the DNS_CLIENTINFOMETHODS_VERSION check
			in DLZ example driver. [RT #32275]

diff --git a/CHANGES b/CHANGES
index 5b459ee63c1c4d460c10a972af6ee34c893e0902..d6b3068323d8a14184861d130ce3ad6f71fd8942 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3466.  [contrib]       Corrected the DNS_CLIENTINFOMETHODS_VERSION check
+                       in DLZ example driver. [RT #32275]
+
 3465.  [bug]           Handle isolated reserved ports. [RT #31778]
 
 3464.  [maint]         Updates to PKCS#11 openssl patches, supporting

diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c
index 26248fab6e7e1c53ae0aecc6ca546208d777978b..55976bbceab69677683525ff068d4bfbcb2721b7 100644 (file)
--- a/bin/tests/system/dlzexternal/driver.c
+++ b/bin/tests/system/dlzexternal/driver.c
@@ -351,8 +351,9 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
                char buf[100];
                strcpy(buf, "unknown");
                if (methods != NULL &&
-                   methods->version - methods->age >=
-                           DNS_CLIENTINFOMETHODS_VERSION)
+                   methods->version - methods->age <=
+                        DNS_CLIENTINFOMETHODS_VERSION &&
+                   DNS_CLIENTINFOMETHODS_VERSION <= methods->version)
                {
                        methods->sourceip(clientinfo, &src);
                        fmt_address(src, buf, sizeof(buf));

diff --git a/contrib/dlz/example/Makefile b/contrib/dlz/example/Makefile
index b8509aaf11d27b9a81d548d538c47e5b09e69e18..5e84043fa60f4543da7471b394ff68631a63f6e7 100644 (file)
--- a/contrib/dlz/example/Makefile
+++ b/contrib/dlz/example/Makefile
@@ -5,7 +5,7 @@
 # this means this Makefile is not portable, so the testsuite
 # skips this test on platforms where it doesn't build
 
-CFLAGS=-fPIC -g
+CFLAGS=-Wall -fPIC -g
 
 all: dlz_example.so
 

diff --git a/contrib/dlz/example/dlz_example.c b/contrib/dlz/example/dlz_example.c
index 722d2dcd917a6ba9c5e1a29e518d6f135f007c7b..efd1f9c5ed2a7246ce077da244fe8b63da4312fc 100644 (file)
--- a/contrib/dlz/example/dlz_example.c
+++ b/contrib/dlz/example/dlz_example.c
@@ -349,8 +349,9 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
                char buf[100];
                strcpy(buf, "unknown");
                if (methods != NULL &&
-                   methods->version - methods->age >=
-                           DNS_CLIENTINFOMETHODS_VERSION)
+                   methods->version - methods->age <=
+                        DNS_CLIENTINFOMETHODS_VERSION &&
+                   DNS_CLIENTINFOMETHODS_VERSION <= methods->version)
                {
                        methods->sourceip(clientinfo, &src);
                        fmt_address(src, buf, sizeof(buf));