pullup:

1116.   [bug]           Setting transfers in a server clause, transfers-in,
                        or transfers-per-ns to a value greater than
                        2147483647 disabled transfers.  [RT #2002]
(Technically, this is an API change, but since it only changes the signedness of some
function parameters, it is still binary compatible in practice and I'll let it slip
by without bumping the major library version number)

diff --git a/CHANGES b/CHANGES
index badd9cd350e5cdbfe8b31e061c0d2e824ddbfdc6..a207e1a87827928ba486a725129cb6bb2b868590 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@
                        because the test code was optimized away.
                        [RT #2016]
 
+1116.  [bug]           Setting transfers in a server clause, transfers-in,
+                       or transfers-per-ns to a value greater than
+                       2147483647 disabled transfers.  [RT #2002]
+
 1114.  [port]          Ignore more accept() errors. [RT #2021]
 
 1113.  [bug]           The allow-update-forwarding option was ignored
@@ -18,7 +22,6 @@
                        recursive queries due to a locking hieararchy
                        violation in adb.c. [RT #2017]
 
-
        --- 9.2.0rc9 released ---
 
 1107.  [bug]           nsupdate could catch an assertion failure if an

diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 8629a99da2e593151dedbe3cfbf6743d4ddef208..4539a71942583885893782bd6d7b009a15800ab6 100644 (file)
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.h,v 1.16 2001/08/28 03:58:20 marka Exp $ */
+/* $Id: peer.h,v 1.16.2.1 2001/11/13 18:57:12 gson Exp $ */
 
 #ifndef DNS_PEER_H
 #define DNS_PEER_H 1
@@ -66,7 +66,7 @@ struct dns_peer {
        isc_netaddr_t           address;
        isc_boolean_t           bogus;
        dns_transfer_format_t   transfer_format;
-       int                     transfers;
+       isc_uint32_t            transfers;
        isc_boolean_t           support_ixfr;
        isc_boolean_t           provide_ixfr;
        isc_boolean_t           request_ixfr;
@@ -145,10 +145,10 @@ isc_result_t
 dns_peer_getsupportedns(dns_peer_t *peer, isc_boolean_t *retval);
 
 isc_result_t
-dns_peer_settransfers(dns_peer_t *peer, isc_int32_t newval);
+dns_peer_settransfers(dns_peer_t *peer, isc_uint32_t newval);
 
 isc_result_t
-dns_peer_gettransfers(dns_peer_t *peer, isc_int32_t *retval);
+dns_peer_gettransfers(dns_peer_t *peer, isc_uint32_t *retval);
 
 isc_result_t
 dns_peer_settransferformat(dns_peer_t *peer, dns_transfer_format_t newval);

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 7329feef8bcde6ca0cb180e9eb99970d06c6af4f..b1b4f1b05b7338b275bafcc13c541ddd2ad10d4d 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.106 2001/08/27 21:47:00 gson Exp $ */
+/* $Id: zone.h,v 1.106.2.1 2001/11/13 18:57:14 gson Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -1175,7 +1175,7 @@ dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone);
  */
 
 void
-dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, int value);
+dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, isc_uint32_t value);
 /*
  *     Set the maximum number of simultanious transfers in allowed by
  *     the zone manager.
@@ -1184,7 +1184,7 @@ dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, int value);
  *     'zmgr' to be a valid zone manager.
  */
 
-int
+isc_uint32_t
 dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr);
 /*
  *     Return the the maximum number of simultanious transfers in allowed.
@@ -1194,7 +1194,7 @@ dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr);
  */
 
 void
-dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, int value);
+dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, isc_uint32_t value);
 /*
  *     Set the number of zone transfers allowed per nameserver.
  *
@@ -1202,7 +1202,7 @@ dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, int value);
  *     'zmgr' to be a valid zone manager
  */
 
-int
+isc_uint32_t
 dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr);
 /*
  *     Return the number of transfers allowed per nameserver.

diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index f546eb52b1927bd07699505f73a852b07ca30d25..70f6028e42e8d07157708958e21985b08f84a9c0 100644 (file)
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.c,v 1.14 2001/03/06 23:54:33 bwelling Exp $ */
+/* $Id: peer.c,v 1.14.2.1 2001/11/13 18:57:09 gson Exp $ */
 
 #include <config.h>
 
@@ -386,7 +386,7 @@ dns_peer_getsupportedns(dns_peer_t *peer, isc_boolean_t *retval) {
 }
 
 isc_result_t
-dns_peer_settransfers(dns_peer_t *peer, isc_int32_t newval) {
+dns_peer_settransfers(dns_peer_t *peer, isc_uint32_t newval) {
        isc_boolean_t existed;
 
        REQUIRE(DNS_PEER_VALID(peer));
@@ -400,7 +400,7 @@ dns_peer_settransfers(dns_peer_t *peer, isc_int32_t newval) {
 }
 
 isc_result_t
-dns_peer_gettransfers(dns_peer_t *peer, isc_int32_t *retval) {
+dns_peer_gettransfers(dns_peer_t *peer, isc_uint32_t *retval) {
        REQUIRE(DNS_PEER_VALID(peer));
        REQUIRE(retval != NULL);
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index cfb5213905ee9b6e1d9a9eaa2aed097dcf988625..98af14bd9f1a6d4bbb4359efd5304b13c2c28d7a 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.333.2.4 2001/10/23 02:41:57 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.5 2001/11/13 18:57:11 gson Exp $ */
 
 #include <config.h>
 
@@ -279,8 +279,8 @@ struct dns_zonemgr {
        dns_zonelist_t          xfrin_in_progress;
 
        /* Configuration data. */
-       int                     transfersin;
-       int                     transfersperns;
+       isc_uint32_t            transfersin;
+       isc_uint32_t            transfersperns;
        unsigned int            serialqueryrate;
 
        /* Locked by iolock */
@@ -5531,13 +5531,13 @@ zonemgr_free(dns_zonemgr_t *zmgr) {
 }
 
 void
-dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, int value) {
+dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, isc_uint32_t value) {
        REQUIRE(DNS_ZONEMGR_VALID(zmgr));
 
        zmgr->transfersin = value;
 }
 
-int
+isc_uint32_t
 dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr) {
        REQUIRE(DNS_ZONEMGR_VALID(zmgr));
 
@@ -5545,13 +5545,13 @@ dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr) {
 }
 
 void
-dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, int value) {
+dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, isc_uint32_t value) {
        REQUIRE(DNS_ZONEMGR_VALID(zmgr));
 
        zmgr->transfersperns = value;
 }
 
-int
+isc_uint32_t
 dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr) {
        REQUIRE(DNS_ZONEMGR_VALID(zmgr));
 
@@ -5614,9 +5614,9 @@ static isc_result_t
 zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
        dns_peer_t *peer = NULL;
        isc_netaddr_t masterip;
-       int nxfrsin, nxfrsperns;
+       isc_uint32_t nxfrsin, nxfrsperns;
        dns_zone_t *x;
-       int maxtransfersin, maxtransfersperns;
+       isc_uint32_t maxtransfersin, maxtransfersperns;
        isc_event_t *e;
 
        /*