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

                        compiler warnings. [RT #36931]

(cherry picked from commit 58f1ac8dadf2c1f215343a0b2d1df2df954c4b19)

diff --git a/CHANGES b/CHANGES
index 060ce71034762f8d0eb40695925967d51398c762..db5e0326c266dbe4714827c7dd1d989ccf345f7d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-3915   [bug]           Address a assertion if a route event arrived while
+3916.  [contrib]       zone2sqlite checked wrong result code.  Address
+                       compiler warnings. [RT #36931]
+
+3915.  [bug]           Address a assertion if a route event arrived while
                        shutting down. [RT #36887]
 
        --- 9.10.1b2 released ---

diff --git a/contrib/sdb/bdb/bdb.c b/contrib/sdb/bdb/bdb.c
index e4393bc52c94db11e86a409bd9e8a00b58745196..23594bbe3c6670673b2ac842b67b713c0e0f517a 100644 (file)
--- a/contrib/sdb/bdb/bdb.c
+++ b/contrib/sdb/bdb/bdb.c
@@ -229,7 +229,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 efaf892c2721d946b715086d350f00259b7ab553..babdf7ace4341c587da259103b91a2009cd30c01 100644 (file)
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -179,7 +179,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 08d8df4539c5f809b7e27843f70cc28ed42b6966..caade37c80e0a7ae8320d6faa3e921e094a90022 100644 (file)
--- a/contrib/sdb/ldap/ldapdb.c
+++ b/contrib/sdb/ldap/ldapdb.c
@@ -386,6 +386,8 @@ ldapdb_lookup(const char *zone, const char *name, void *dbdata,
              dns_sdblookup_t *lookup, dns_clientinfomethods_t *methods,
              dns_clientinfo_t *clientinfo)
 {
+       UNUSED(methods);
+       UNUSED(clientinfo);
        return (ldapdb_search(zone, name, dbdata, lookup, NULL, NULL));
 }
 #else
@@ -661,7 +663,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 fa3d453d8136c6060a7d8a69c3c7b6637407b66e..7eaef371f5e5a8b2cb248291cb52fcca55e111f9 100644 (file)
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -335,7 +335,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 8491aa8a5a6dbeb3be47a0d597c1837532a786d7..57fe16db16bac45f195657cbf1fc18b901e0e3fb 100644 (file)
--- a/contrib/sdb/sqlite/sqlitedb.c
+++ b/contrib/sdb/sqlite/sqlitedb.c
@@ -306,7 +306,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 9035600e72fa03c92165edbd80cf64022d749f9c..8bd8b470e2cf57144e28f1bb7692a4ebaa60fdd8 100644 (file)
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -213,7 +213,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 704014f13eb5210d94bbb7f47eb943def122814c..f621726a3efe65c7486aea6a90328b0061dbfb0f 100644 (file)
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -130,7 +130,8 @@ static dns_sdbmethods_t timedb_methods = {
        timedb_authority,
        NULL,   /* allnodes */
        NULL,   /* create */
-       NULL    /* destroy */
+       NULL,   /* destroy */
+       NULL    /* lookup2 */
 };
 
 /*