Name change to two config file functions.
This commit is contained in:
+3
-2
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
+4
-4
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user