WIN32 master fixes

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index baef5f7d18d3205bb71abfbcc597cb2566f5ab1c..6f9b4615881abde612ab27d03027add23fa99cb1 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3167,7 +3167,7 @@ process_sit(dig_lookup_t *l, isc_buffer_t *optbuf, size_t optlen) {
                        printf(";; Warning: SIT client cookie part mis-match\n");
        } else
                printf(";; Warning: SIT bad token (too short)\n");
-       isc_buffer_forward(optbuf, optlen);
+       isc_buffer_forward(optbuf, (unsigned int)optlen);
 }
 
 static void

diff --git a/bin/named/client.c b/bin/named/client.c
index 4f308c4efb3877c67856be47a3395394026b028c..c4e1c751d282324abed5756a16086dcebc466531 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1644,7 +1644,7 @@ process_sit(ns_client_t *client, isc_buffer_t *buf, size_t optlen) {
                        memcpy(client->cookie, isc_buffer_current(buf), 8);
                else
                        memset(client->cookie, 0, 8);
-               isc_buffer_forward(buf, optlen);
+               isc_buffer_forward(buf, (unsigned int)optlen);
 
                if (optlen == 8)
                        isc_stats_increment(ns_g_server->nsstats,

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index f6d239137e58ecd4ad11242f1d9721cb131507d4..fbd67a70e93d3928b0ca8a23532777a076bd9374 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -4282,7 +4282,7 @@ dns_adb_setsit(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
        if (addr->entry->sit == NULL && sit != NULL && len != 0U) {
                addr->entry->sit = isc_mem_get(adb->mctx, len);
                if (addr->entry->sit != NULL)
-                       addr->entry->sitlen = len;
+                       addr->entry->sitlen = (isc_uint16_t)len;
        }
 
        if (addr->entry->sit != NULL)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 66ab41fe523fbbd1eedbfa211939fe746430ba97..4e4348ba112eb9e9e1290dab6b058aeee9c5c2d9 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2076,7 +2076,7 @@ resquery_send(resquery_t *query) {
                        if (reqsit) {
                                INSIST(ednsopt < EDNSOPTS);
                                ednsopts[ednsopt].code = DNS_OPT_SIT;
-                               ednsopts[ednsopt].length =
+                               ednsopts[ednsopt].length = (isc_uint16_t)
                                        dns_adb_getsit(fctx->adb,
                                                       query->addrinfo,
                                                       sit, sizeof(sit));

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 348c2bc3478a25e96ee9784fe0c9e350da691992..0996235891153cbf5e1b46b979d0d6ddeb970bb1 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -496,6 +496,7 @@ dns_peer_setquerydscp
 dns_peer_setquerysource
 dns_peer_setrequestixfr
 dns_peer_setrequestnsid
+dns_peer_setrequestsit
 dns_peer_setsupportedns
 dns_peer_settransferdscp
 dns_peer_settransferformat
@@ -870,6 +871,7 @@ dns_zone_getjournalsize
 dns_zone_getkeydirectory
 dns_zone_getkeyopts
 dns_zone_getloadtime
+dns_zone_getmaxttl
 dns_zone_getmaxxfrin
 dns_zone_getmaxxfrout
 dns_zone_getmctx
@@ -880,6 +882,7 @@ dns_zone_getnotifysrc4dscp
 dns_zone_getnotifysrc6
 dns_zone_getnotifysrc6dscp
 dns_zone_getoptions
+dns_zone_getoptions2
 dns_zone_getorigin
 dns_zone_getprivatetype
 dns_zone_getqueryacl
@@ -961,6 +964,7 @@ dns_zone_setmasters
 dns_zone_setmasterswithkeys
 dns_zone_setmaxrefreshtime
 dns_zone_setmaxretrytime
+dns_zone_setmaxttl
 dns_zone_setmaxxfrin
 dns_zone_setmaxxfrout
 dns_zone_setminrefreshtime
@@ -975,6 +979,7 @@ dns_zone_setnotifysrc6dscp
 dns_zone_setnotifytype
 dns_zone_setnsec3param
 dns_zone_setoption
+dns_zone_setoption2
 dns_zone_setorigin
 dns_zone_setprivatetype
 dns_zone_setqueryacl