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

deal with the default view

Browse Source
This commit is contained in:
Andreas Gustafsson
2000-05-25 22:10:29 +00:00
parent c885fad9b8
commit 8c7eaac6bb
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/named/tsigconf.c
View File

@@ -144,14 +144,16 @@ dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx,
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto failure; goto failure;
keylist = NULL; if (confview != NULL) {
result = dns_c_view_getkeydefs(confview, &keylist); keylist = NULL;
if (result == ISC_R_SUCCESS) result = dns_c_view_getkeydefs(confview, &keylist);
result = add_initial_keys(keylist, ring, mctx); if (result == ISC_R_SUCCESS)
else if (result == ISC_R_NOTFOUND) result = add_initial_keys(keylist, ring, mctx);
result = ISC_R_SUCCESS; else if (result == ISC_R_NOTFOUND)
if (result != ISC_R_SUCCESS) result = ISC_R_SUCCESS;
goto failure; if (result != ISC_R_SUCCESS)
goto failure;
}
*ringp = ring; *ringp = ring;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);

18
lib/dns/tsigconf.c
View File

@@ -144,14 +144,16 @@ dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx,
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto failure; goto failure;
keylist = NULL; if (confview != NULL) {
result = dns_c_view_getkeydefs(confview, &keylist); keylist = NULL;
if (result == ISC_R_SUCCESS) result = dns_c_view_getkeydefs(confview, &keylist);
result = add_initial_keys(keylist, ring, mctx); if (result == ISC_R_SUCCESS)
else if (result == ISC_R_NOTFOUND) result = add_initial_keys(keylist, ring, mctx);
result = ISC_R_SUCCESS; else if (result == ISC_R_NOTFOUND)
if (result != ISC_R_SUCCESS) result = ISC_R_SUCCESS;
goto failure; if (result != ISC_R_SUCCESS)
goto failure;
}
*ringp = ring; *ringp = ring;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);