3916. [contrib] zone2sqlite checked wrong result code. Address

                        compiler warnings. [RT #36931]

(cherry picked from commit 58f1ac8dadf2c1f215343a0b2d1df2df954c4b19)

diff --git a/CHANGES b/CHANGES
index a9a3f4300507ccb524c9e34955e2392709ed0520..3c8126f306d95c367b159c6d8ef66eafcf4901dc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3916.  [contrib]       zone2sqlite checked wrong result code.  Address
+                       compiler warnings. [RT #36931]
+
        --- 9.8.8b2 released ---
 
 3914.  [bug]           Allow the URI target and CAA value fields to

diff --git a/contrib/sdb/bdb/bdb.c b/contrib/sdb/bdb/bdb.c
index f191e845ccee0a551c1dd08b69e31cc7cce423a1..f9c8c19f5987740486f8f2e1ca25a27ce1c40e88 100644 (file)
--- a/contrib/sdb/bdb/bdb.c
+++ b/contrib/sdb/bdb/bdb.c
@@ -219,7 +219,8 @@ bdb_init(void)
                NULL,
                bdb_allnodes,
                bdb_create,
-               bdb_destroy
+               bdb_destroy,
+               NULL /* lookup2 */
        };
 
        return dns_sdb_register(DRIVERNAME, &bdb_methods, NULL, 0, ns_g_mctx,

diff --git a/contrib/sdb/dir/dirdb.c b/contrib/sdb/dir/dirdb.c
index 30dea5f90967f60bd90e7c9b36fa3eb95be29667..b6c9c6d997856c17835285e7dac92f2d069dbcf1 100644 (file)
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -168,7 +168,8 @@ static dns_sdbmethods_t dirdb_methods = {
        dirdb_authority,
        NULL, /* allnodes */
        dirdb_create,
-       dirdb_destroy
+       dirdb_destroy,
+       NULL /* lookup2 */
 };
 
 /*

diff --git a/contrib/sdb/ldap/ldapdb.c b/contrib/sdb/ldap/ldapdb.c
index ed124c07eac38e235abf662273e0e3e4cf505126..310a65001b7ec4a0b2044631b3986ec3bd1c09df 100644 (file)
--- a/contrib/sdb/ldap/ldapdb.c
+++ b/contrib/sdb/ldap/ldapdb.c
@@ -640,7 +640,8 @@ static dns_sdbmethods_t ldapdb_methods = {
        NULL, /* authority */
        ldapdb_allnodes,
        ldapdb_create,
-       ldapdb_destroy
+       ldapdb_destroy,
+       NULL /* lookup2 */
 };
 
 /* Wrapper around dns_sdb_register() */

diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
index 5670562f77615687d76993debb0db07ee119e117..6c4ccc5586e13275b4ce304d6a62dd8d05496a5e 100644 (file)
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -324,7 +324,8 @@ static dns_sdbmethods_t pgsqldb_methods = {
        NULL, /* authority */
        pgsqldb_allnodes,
        pgsqldb_create,
-       pgsqldb_destroy
+       pgsqldb_destroy,
+       NULL /* lookup2 */
 };
 
 /*

diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index a26d72d4b31d414e81b0f13b1ea5fa8f9f6a89c4..7855c816c5988c2831af4111d31fbf95f7c1a9ce 100644 (file)
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -74,7 +74,7 @@ check_result(isc_result_t result, const char *message) {
  * "dest" must be an array of at least size 2*strlen(source) + 1.
  */
 static void
-quotestring(const char *source, char *dest) {
+quotestring(const unsigned char *source, unsigned char *dest) {
        while (*source != 0) {
                if (*source == '\'')
                        *dest++ = '\'';
@@ -101,19 +101,19 @@ addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
        result = dns_name_totext(name, ISC_TRUE, &b);
        check_result(result, "dns_name_totext");
        namearray[isc_buffer_usedlength(&b)] = 0;
-       quotestring(namearray, canonnamearray);
+       quotestring((const unsigned char *)namearray, canonnamearray);
 
        isc_buffer_init(&b, typearray, sizeof(typearray) - 1);
        result = dns_rdatatype_totext(rdata->type, &b);
        check_result(result, "dns_rdatatype_totext");
        typearray[isc_buffer_usedlength(&b)] = 0;
-       quotestring(typearray, canontypearray);
+       quotestring((const unsigned char *)typearray, canontypearray);
 
        isc_buffer_init(&b, dataarray, sizeof(dataarray) - 1);
        result = dns_rdata_totext(rdata, NULL, &b);
        check_result(result, "dns_rdata_totext");
        dataarray[isc_buffer_usedlength(&b)] = 0;
-       quotestring(dataarray, canondataarray);
+       quotestring((const unsigned char *)dataarray, canondataarray);
 
        snprintf(str, sizeof(str),
                 "INSERT INTO %s (NAME, TTL, RDTYPE, RDATA)"

diff --git a/contrib/sdb/sqlite/sqlitedb.c b/contrib/sdb/sqlite/sqlitedb.c
index fe1f49a79eec7688a103d534c1256abead164c54..406b23057433b1edb158874da1767d799fe020e0 100644 (file)
--- a/contrib/sdb/sqlite/sqlitedb.c
+++ b/contrib/sdb/sqlite/sqlitedb.c
@@ -296,7 +296,8 @@ static dns_sdbmethods_t sqlitedb_methods = {
     NULL, /* authority */
     sqlitedb_allnodes,
     sqlitedb_create,
-    sqlitedb_destroy
+    sqlitedb_destroy,
+    NULL /* lookup2 */
 };
 
 

diff --git a/contrib/sdb/sqlite/zone2sqlite.c b/contrib/sdb/sqlite/zone2sqlite.c
index 7b9260a25047704f94a8fe674df49b218843b6d7..7bcb6f036838dd12d0a6caf0f4bd5c6b5597fea9 100644 (file)
--- a/contrib/sdb/sqlite/zone2sqlite.c
+++ b/contrib/sdb/sqlite/zone2sqlite.c
@@ -137,7 +137,7 @@ addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata)
     res = sqlite3_exec(dbi.db, sql, add_rdata_cb, NULL, &errmsg);
     sqlite3_free(sql);
 
-    if (result != SQLITE_OK) {
+    if (res != SQLITE_OK) {
        fprintf(stderr, "INSERT failed: %s\n", errmsg);
        closeandexit(1);
     }

diff --git a/contrib/sdb/tcl/tcldb.c b/contrib/sdb/tcl/tcldb.c
index 9a46b1f558fb1da94e3055b441819b6f4f390af1..37f200e49bbeb819ccc4033d6adfa0114b623a35 100644 (file)
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -201,7 +201,8 @@ static dns_sdbmethods_t tcldb_methods = {
        NULL, /* authority */
        NULL, /* allnodes */
        tcldb_create,
-       NULL /* destroy */
+       NULL, /* destroy */
+       NULL /* lookup2 */
 };
 
 /*

diff --git a/contrib/sdb/time/timedb.c b/contrib/sdb/time/timedb.c
index 3a224ea5cdd1151ca36b4c50937760ad7d9c5568..9d542c56ccb546106c189fcc2f26789c30f35220 100644 (file)
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -119,7 +119,8 @@ static dns_sdbmethods_t timedb_methods = {
        timedb_authority,
        NULL,   /* allnodes */
        NULL,   /* create */
-       NULL    /* destroy */
+       NULL,   /* destroy */
+       NULL    /* lookup2 */
 };
 
 /*