upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 02:22:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

made 'support-ixfr' a synonym for 'request-ixfr'

Browse source
This commit is contained in:
Andreas Gustafsson 2000-03-20 19:40:04 +00:00
parent aa8e34546c
commit 72166c5cf5
3 changed files with 8 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dns/config/confcommon.c
View file

@ -664,12 +664,6 @@ dns_c_peer_print(FILE *fp, int indent, dns_peer_t *peer)
fprintf(fp, "transfers %d;\n", ival);
}
res = dns_peer_getsupportixfr(peer, &bval);
if (res == ISC_R_SUCCESS) {
dns_c_printtabs(fp, indent + 1);
fprintf(fp, "support-ixfr %s;\n", (bval ? "true" : "false"));
}
res = dns_peer_getprovideixfr(peer, &bval);
if (res == ISC_R_SUCCESS) {
dns_c_printtabs(fp, indent + 1);

11
lib/dns/config/confparser.y
View file

@ -16,7 +16,7 @@
* SOFTWARE.
*/
/* $Id: confparser.y,v 1.50 2000/03/19 02:58:13 brister Exp $ */
/* $Id: confparser.y,v 1.51 2000/03/20 19:39:15 gson Exp $ */
#include <config.h>
@ -2192,20 +2192,23 @@ server_info: L_BOGUS yea_or_nay
}
| L_SUPPORT_IXFR yea_or_nay
{
/*
* Backwards compatibility, equivalent to provide-ixfr
*/
dns_peer_t *peer = NULL;
dns_peerlist_currpeer(currcfg->peers, &peer);
INSIST(peer != NULL);
tmpres = dns_peer_setsupportixfr(peer, $2);
tmpres = dns_peer_setprovideixfr(peer, $2);
dns_peer_detach(&peer);
if (tmpres == ISC_R_EXISTS) {
parser_warning(ISC_FALSE,
"redefining peer support-ixfr value");
"redefining peer provide-ixfr value");
} else if(tmpres != ISC_R_SUCCESS) {
parser_error(ISC_FALSE,
"error setting peer "
"support-ixfr value");
"provide-ixfr value");
YYABORT;
}
}

37
lib/dns/peer.c
View file

@ -36,9 +36,8 @@
#define BOGUS_BIT 0
#define SERVER_TRANSFER_FORMAT_BIT 1
#define TRANSFERS_BIT 2
#define SUPPORT_IXFR_BIT 3
#define PROVIDE_IXFR_BIT 3
#define REQUEST_IXFR_BIT 4
#define PROVIDE_IXFR_BIT 5
static isc_result_t dns_peerlist_delete(dns_peerlist_t **list);
static isc_result_t dns_peer_delete(dns_peer_t **peer);
@ -216,7 +215,6 @@ dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr)
peer->bogus = ISC_FALSE;
peer->transfer_format = dns_one_answer;
peer->transfers = 0;
peer->support_ixfr = ISC_FALSE;
peer->request_ixfr = ISC_FALSE;
peer->provide_ixfr = ISC_FALSE;
peer->key = NULL;
@ -334,39 +332,6 @@ dns_peer_getbogus(dns_peer_t *peer,
}
isc_result_t
dns_peer_setsupportixfr(dns_peer_t *peer,
isc_boolean_t newval)
{
isc_boolean_t existed;
REQUIRE(DNS_PEER_VALID(peer));
existed = DNS_CHECKBIT(SUPPORT_IXFR_BIT, &peer->bitflags);
peer->support_ixfr = newval;
DNS_SETBIT(SUPPORT_IXFR_BIT, &peer->bitflags);
return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
}
isc_result_t
dns_peer_getsupportixfr(dns_peer_t *peer,
isc_boolean_t *retval)
{
REQUIRE(DNS_PEER_VALID(peer));
REQUIRE(retval != NULL);
if (DNS_CHECKBIT(SUPPORT_IXFR_BIT, &peer->bitflags)) {
*retval = peer->support_ixfr;
return (ISC_R_SUCCESS);
} else {
return (ISC_R_NOTFOUND);
}
}
isc_result_t
dns_peer_setprovideixfr(dns_peer_t *peer,
isc_boolean_t newval)