From c47baa985c31bbcf396b52958654164afd1091c6 Mon Sep 17 00:00:00 2001 From: James Brister Date: Thu, 6 Apr 2000 20:08:34 +0000 Subject: [PATCH] Name change to two config file functions. --- bin/named/server.c | 5 +++-- bin/named/zoneconf.c | 8 ++++---- lib/dns/zoneconf.c | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index 53d0071565..86c465886e 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -949,10 +949,11 @@ load_configuration(const char *filename, ns_server_t *server, &server->transfer_format); CHECK(configure_server_acl(configctx, &aclconfctx, ns_g_mctx, - dns_c_ctx_getqueryacl, &server->queryacl)); + dns_c_ctx_getallowquery, + &server->queryacl)); CHECK(configure_server_acl(configctx, &aclconfctx, ns_g_mctx, - dns_c_ctx_getrecursionacl, + dns_c_ctx_getallowrecursion, &server->recursionacl)); configure_server_quota(configctx, dns_c_ctx_gettransfersout, diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 0b34a28052..9e09a6309f 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -144,7 +144,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowquery, - dns_c_ctx_getqueryacl, + dns_c_ctx_getallowquery, dns_zone_setqueryacl, dns_zone_clearqueryacl); if (result != DNS_R_SUCCESS) @@ -152,7 +152,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowtransfer, - dns_c_ctx_gettransferacl, + dns_c_ctx_getallowtransfer, dns_zone_setxfracl, dns_zone_clearxfracl); if (result != DNS_R_SUCCESS) @@ -236,7 +236,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, #endif result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowquery, - dns_c_ctx_getqueryacl, + dns_c_ctx_getallowquery, dns_zone_setqueryacl, dns_zone_clearqueryacl); if (result != DNS_R_SUCCESS) @@ -328,7 +328,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, #endif result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowquery, - dns_c_ctx_getqueryacl, + dns_c_ctx_getallowquery, dns_zone_setqueryacl, dns_zone_clearqueryacl); if (result != DNS_R_SUCCESS) diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c index 0b34a28052..9e09a6309f 100644 --- a/lib/dns/zoneconf.c +++ b/lib/dns/zoneconf.c @@ -144,7 +144,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowquery, - dns_c_ctx_getqueryacl, + dns_c_ctx_getallowquery, dns_zone_setqueryacl, dns_zone_clearqueryacl); if (result != DNS_R_SUCCESS) @@ -152,7 +152,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowtransfer, - dns_c_ctx_gettransferacl, + dns_c_ctx_getallowtransfer, dns_zone_setxfracl, dns_zone_clearxfracl); if (result != DNS_R_SUCCESS) @@ -236,7 +236,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, #endif result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowquery, - dns_c_ctx_getqueryacl, + dns_c_ctx_getallowquery, dns_zone_setqueryacl, dns_zone_clearqueryacl); if (result != DNS_R_SUCCESS) @@ -328,7 +328,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_aclconfctx_t *ac, #endif result = configure_zone_acl(czone, cctx, ac, zone, dns_c_zone_getallowquery, - dns_c_ctx_getqueryacl, + dns_c_ctx_getallowquery, dns_zone_setqueryacl, dns_zone_clearqueryacl); if (result != DNS_R_SUCCESS)