mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 23:55:27 +00:00
Code Issues Releases Wiki Activity

cleanups; change viewlist find routine

Browse Source
This commit is contained in:
Bob Halley
1999-10-15 01:43:39 +00:00
parent df0453520c
commit e7dbdb2547
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dns/include/dns/view.h
View File

@@ -301,9 +301,9 @@ dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
* or an error occurred. * or an error occurred.
*/ */
dns_view_t * isc_result_t
dns_view_findinlist(dns_viewlist_t *list, const char *name, dns_viewlist_find(dns_viewlist_t *list, const char *name,
dns_rdataclass_t rdclass); dns_rdataclass_t rdclass, dns_view_t **viewp);
/* /*
* XXX * XXX
*/ */

31
lib/dns/view.c
View File

@@ -264,20 +264,17 @@ dns_view_freeze(dns_view_t *view) {
} }
isc_result_t isc_result_t
dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zone) { dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zonep) {
isc_result_t result; isc_result_t result;
dns_zone_t *dummy = NULL;
REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(DNS_VIEW_VALID(view));
result = dns_zt_find(view->zonetable, name, NULL, &dummy); result = dns_zt_find(view->zonetable, name, NULL, zonep);
if (result == DNS_R_PARTIALMATCH) { if (result == DNS_R_PARTIALMATCH) {
dns_zone_detach(&dummy); dns_zone_detach(zonep);
result = DNS_R_NOTFOUND; result = DNS_R_NOTFOUND;
} else if (result == DNS_R_SUCCESS) {
dns_zone_attach(dummy, zone);
dns_zone_detach(&dummy);
} }
return (result); return (result);
} }
@@ -431,18 +428,24 @@ dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
return (result); return (result);
} }
dns_view_t * isc_result_t
dns_view_findinlist(dns_viewlist_t *list, const char *name, dns_viewlist_find(dns_viewlist_t *list, const char *name,
dns_rdataclass_t rdclass) { dns_rdataclass_t rdclass, dns_view_t **viewp)
{
dns_view_t *view; dns_view_t *view;
REQUIRE(list != NULL); REQUIRE(list != NULL);
view = ISC_LIST_HEAD(*list); for (view = ISC_LIST_HEAD(*list);
while (view != NULL) { view != NULL;
view = ISC_LIST_NEXT(view, link)) {
if (strcmp(view->name, name) == 0 && view->rdclass == rdclass) if (strcmp(view->name, name) == 0 && view->rdclass == rdclass)
break; break;
view = ISC_LIST_NEXT(view, link);
} }
return (view); if (view == NULL)
return (ISC_R_NOTFOUND);
dns_view_attach(view, viewp);
return (ISC_R_SUCCESS);
} }