Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
41959049
Commit
41959049
authored
Apr 06, 2000
by
Michael Graff
Browse files
s/DNS_R_/ISC_R_/ change for some codes.
parent
c1a2cfef
Changes
113
Expand all
Hide whitespace changes
Inline
Side-by-side
bin/dnssec/dnssec-signzone.c
View file @
41959049
...
...
@@ -266,9 +266,9 @@ expecttofindkey(dns_name_t *name, dns_db_t *db, dns_dbversion_t *version) {
result
=
dns_db_find
(
db
,
name
,
version
,
dns_rdatatype_key
,
options
,
0
,
NULL
,
dns_fixedname_name
(
&
fname
),
NULL
,
NULL
);
switch
(
result
)
{
case
DNS
_R_SUCCESS
:
case
ISC
_R_SUCCESS
:
case
DNS_R_NXDOMAIN
:
case
DNS_R_NXR
DATA
SET
:
case
DNS_R_NXR
R
SET
:
return
ISC_TRUE
;
case
DNS_R_DELEGATION
:
case
DNS_R_CNAME
:
...
...
@@ -470,7 +470,7 @@ signset(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
dns_rdata_freestruct
(
&
sig
);
result
=
dns_rdataset_next
(
&
oldsigset
);
}
if
(
result
==
DNS
_R_NOMORE
)
if
(
result
==
ISC
_R_NOMORE
)
result
=
ISC_R_SUCCESS
;
check_result
(
result
,
"dns_db_dns_rdataset_first()/next()"
);
dns_rdataset_disassociate
(
&
oldsigset
);
...
...
@@ -569,7 +569,7 @@ hasnullkey(dns_rdataset_t rdataset) {
return
(
ISC_TRUE
);
result
=
dns_rdataset_next
(
&
rdataset
);
}
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
check_result
(
result
,
"iteration over keys"
);
return
(
ISC_FALSE
);
}
...
...
@@ -669,7 +669,7 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
dns_rdataset_disassociate
(
&
rdataset
);
result
=
dns_rdatasetiter_next
(
rdsiter
);
}
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
fatal
(
"rdataset iteration failed"
);
dns_rdatasetiter_destroy
(
&
rdsiter
);
}
...
...
@@ -694,9 +694,9 @@ active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) {
if
(
!
active
)
result
=
dns_rdatasetiter_next
(
rdsiter
);
else
result
=
DNS
_R_NOMORE
;
result
=
ISC
_R_NOMORE
;
}
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
fatal
(
"rdataset iteration failed"
);
dns_rdatasetiter_destroy
(
&
rdsiter
);
...
...
@@ -850,7 +850,7 @@ signzone(dns_db_t *db, dns_dbversion_t *version) {
&
nextnode
,
origin
,
lastcut
);
if
(
result
==
ISC_R_SUCCESS
)
target
=
nextname
;
else
if
(
result
==
DNS
_R_NOMORE
)
else
if
(
result
==
ISC
_R_NOMORE
)
target
=
origin
;
else
{
target
=
NULL
;
/* Make compiler happy. */
...
...
@@ -864,7 +864,7 @@ signzone(dns_db_t *db, dns_dbversion_t *version) {
dns_db_detachnode
(
db
,
&
curnode
);
node
=
nextnode
;
}
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
fatal
(
"db iteration failed"
);
if
(
lastcut
!=
NULL
)
{
dns_name_free
(
lastcut
,
mctx
);
...
...
bin/named/aclconf.c
View file @
41959049
...
...
@@ -65,14 +65,14 @@ convert_named_acl(char *aclname, dns_c_ctx_t *cctx,
}
/* Not yet converted. Convert now. */
result
=
dns_c_acltable_getacl
(
cctx
->
acls
,
aclname
,
&
cacl
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
isc_log_write
(
dns_lctx
,
DNS_LOGCATEGORY_SECURITY
,
DNS_LOGMODULE_ACL
,
ISC_LOG_WARNING
,
"undefined ACL '%s'"
,
aclname
);
return
(
result
);
}
result
=
dns_acl_fromconfig
(
cacl
->
ipml
,
cctx
,
ctx
,
mctx
,
&
dacl
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
return
(
result
);
dacl
->
name
=
aclname
;
ISC_LIST_APPEND
(
ctx
->
named_acl_cache
,
dacl
,
nextincache
);
...
...
bin/named/client.c
View file @
41959049
...
...
@@ -991,12 +991,12 @@ client_request(isc_task_t *task, isc_event_t *event) {
client
->
signer
=
NULL
;
dns_name_init
(
&
client
->
signername
,
NULL
);
result
=
dns_message_signer
(
client
->
message
,
&
client
->
signername
);
if
(
result
==
DNS
_R_SUCCESS
)
{
if
(
result
==
ISC
_R_SUCCESS
)
{
ns_client_log
(
client
,
DNS_LOGCATEGORY_SECURITY
,
NS_LOGMODULE_CLIENT
,
ISC_LOG_DEBUG
(
3
),
"request has valid signature"
);
client
->
signer
=
&
client
->
signername
;
}
else
if
(
result
==
DNS
_R_NOTFOUND
)
{
}
else
if
(
result
==
ISC
_R_NOTFOUND
)
{
ns_client_log
(
client
,
DNS_LOGCATEGORY_SECURITY
,
NS_LOGMODULE_CLIENT
,
ISC_LOG_DEBUG
(
3
),
"request is not signed"
);
...
...
@@ -1024,7 +1024,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
/* XXX this will log too much too early */
ns_client_checkacl
(
client
,
"recursion"
,
ns_g_server
->
recursionacl
,
ISC_TRUE
)
==
DNS
_R_SUCCESS
)
ISC_TRUE
)
==
ISC
_R_SUCCESS
)
ra
=
ISC_TRUE
;
if
(
ra
==
ISC_TRUE
)
...
...
@@ -1584,7 +1584,7 @@ ns_client_checkacl(ns_client_t *client,
result
=
dns_acl_match
(
&
netaddr
,
client
->
signer
,
acl
,
&
ns_g_server
->
aclenv
,
&
match
,
NULL
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
deny
;
/* Internal error, already logged. */
if
(
match
>
0
)
goto
allow
;
...
...
@@ -1594,7 +1594,7 @@ ns_client_checkacl(ns_client_t *client,
ns_client_log
(
client
,
DNS_LOGCATEGORY_SECURITY
,
NS_LOGMODULE_CLIENT
,
ISC_LOG_DEBUG
(
3
),
"%s approved"
,
opname
);
return
(
DNS
_R_SUCCESS
);
return
(
ISC
_R_SUCCESS
);
deny:
ns_client_log
(
client
,
DNS_LOGCATEGORY_SECURITY
,
...
...
bin/named/interfacemgr.c
View file @
41959049
...
...
@@ -96,7 +96,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
mgr
=
isc_mem_get
(
mctx
,
sizeof
(
*
mgr
));
if
(
mgr
==
NULL
)
return
(
DNS
_R_NOMEMORY
);
return
(
ISC
_R_NOMEMORY
);
result
=
isc_mutex_init
(
&
mgr
->
lock
);
if
(
result
!=
ISC_R_SUCCESS
)
...
...
@@ -112,7 +112,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
result
=
ns_listenlist_default
(
mctx
,
ns_g_port
,
&
mgr
->
listenon
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup_mem
;
result
=
dns_aclenv_init
(
mctx
,
&
mgr
->
aclenv
);
...
...
@@ -122,7 +122,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
mgr
->
references
=
1
;
mgr
->
magic
=
IFMGR_MAGIC
;
*
mgrp
=
mgr
;
return
(
DNS
_R_SUCCESS
);
return
(
ISC
_R_SUCCESS
);
cleanup_listenon:
ns_listenlist_detach
(
&
mgr
->
listenon
);
...
...
@@ -206,7 +206,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
REQUIRE
(
NS_INTERFACEMGR_VALID
(
mgr
));
ifp
=
isc_mem_get
(
mgr
->
mctx
,
sizeof
(
*
ifp
));
if
(
ifp
==
NULL
)
return
(
DNS
_R_NOMEMORY
);
return
(
ISC
_R_NOMEMORY
);
ifp
->
mgr
=
NULL
;
ifp
->
generation
=
mgr
->
generation
;
ifp
->
addr
=
*
addr
;
...
...
@@ -250,7 +250,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
ifp
->
magic
=
IFACE_MAGIC
;
*
ifpret
=
ifp
;
return
(
DNS
_R_SUCCESS
);
return
(
ISC
_R_SUCCESS
);
task_create_failure:
isc_mutex_destroy
(
&
ifp
->
lock
);
...
...
@@ -258,7 +258,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
ifp
->
magic
=
0
;
isc_mem_put
(
mgr
->
mctx
,
ifp
,
sizeof
(
*
ifp
));
return
(
DNS
_R_UNEXPECTED
);
return
(
ISC
_R_UNEXPECTED
);
}
static
isc_result_t
...
...
@@ -362,7 +362,7 @@ ns_interface_accepttcp(ns_interface_t *ifp) {
tcp_bind_failure:
isc_socket_detach
(
&
ifp
->
tcpsocket
);
tcp_socket_failure:
return
(
DNS
_R_SUCCESS
);
return
(
ISC
_R_SUCCESS
);
}
static
isc_result_t
...
...
@@ -374,18 +374,18 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
REQUIRE
(
ifpret
!=
NULL
&&
*
ifpret
==
NULL
);
result
=
ns_interface_create
(
mgr
,
addr
,
name
,
&
ifp
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
return
(
result
);
result
=
ns_interface_listenudp
(
ifp
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup_interface
;
result
=
ns_interface_accepttcp
(
ifp
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
/*
* XXXRTH We don't currently have a way to easily stop dispatch
* service, so we return currently return
DNS
_R_SUCCESS (the UDP
* service, so we return currently return
ISC
_R_SUCCESS (the UDP
* stuff will work even if TCP creation failed). This will be fixed
* later.
*/
...
...
@@ -601,7 +601,7 @@ do_ipv4(ns_interfacemgr_t *mgr) {
&
listen_sockaddr
,
interface
.
name
,
&
ifp
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
isc_log_write
(
IFMGR_COMMON_LOGARGS
,
ISC_LOG_ERROR
,
"creating IPv4 interface %s "
...
...
@@ -647,7 +647,7 @@ do_ipv6(ns_interfacemgr_t *mgr) {
"listening on IPv6 interfaces, port %u"
,
ns_g_port
);
result
=
ns_interface_setup
(
mgr
,
&
listen_addr
,
"<any>"
,
&
ifp
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
isc_log_write
(
IFMGR_COMMON_LOGARGS
,
ISC_LOG_ERROR
,
"listening on IPv6 interfaces failed"
);
...
...
bin/named/notify.c
View file @
41959049
...
...
@@ -91,12 +91,12 @@
*/
#define CHECK(op) \
do { result = (op); \
if (result !=
DNS
_R_SUCCESS) goto failure; \
if (result !=
ISC
_R_SUCCESS) goto failure; \
} while (0)
/*
* Fail unconditionally with result 'code', which must not
* be
DNS
_R_SUCCESS. The reason for failure presumably has
* be
ISC
_R_SUCCESS. The reason for failure presumably has
* been logged already.
*/
...
...
@@ -166,7 +166,7 @@ ns_notify_start(ns_client_t *client)
* Interpret the question section.
*/
result
=
dns_message_firstname
(
request
,
DNS_SECTION_QUESTION
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
FAILC
(
DNS_R_FORMERR
,
"notify question section empty"
);
...
...
@@ -183,12 +183,12 @@ ns_notify_start(ns_client_t *client)
/* The zone section must have exactly one name. */
result
=
dns_message_nextname
(
request
,
DNS_SECTION_ZONE
);
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
FAILC
(
DNS_R_FORMERR
,
"notify question section contains multiple RRs"
);
result
=
dns_zt_find
(
client
->
view
->
zonetable
,
zonename
,
NULL
,
&
zone
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
FAILC
(
DNS_R_REFUSED
,
"not authoritative for notify zone"
);
...
...
bin/named/query.c
View file @
41959049
...
...
@@ -474,16 +474,16 @@ query_simplefind(void *arg, dns_name_t *name, dns_rdatatype_t type,
zone
=
NULL
;
db
=
NULL
;
result
=
dns_zt_find
(
client
->
view
->
zonetable
,
name
,
NULL
,
&
zone
);
if
(
result
==
DNS
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
{
if
(
result
==
ISC
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
{
isc_result_t
tresult
;
tresult
=
dns_zone_getdb
(
zone
,
&
db
);
if
(
tresult
!=
DNS
_R_SUCCESS
)
if
(
tresult
!=
ISC
_R_SUCCESS
)
result
=
tresult
;
}
if
(
result
==
ISC_R_NOTFOUND
&&
USECACHE
(
client
))
dns_db_attach
(
client
->
view
->
cachedb
,
&
db
);
else
if
(
result
!=
DNS
_R_SUCCESS
&&
result
!=
DNS_R_PARTIALMATCH
)
else
if
(
result
!=
ISC
_R_SUCCESS
&&
result
!=
DNS_R_PARTIALMATCH
)
goto
cleanup
;
/*
...
...
@@ -510,7 +510,7 @@ query_simplefind(void *arg, dns_name_t *name, dns_rdatatype_t type,
rdataset
,
sigrdataset
);
if
(
result
==
DNS_R_DELEGATION
||
result
==
DNS
_R_NOTFOUND
)
{
result
==
ISC
_R_NOTFOUND
)
{
if
(
rdataset
->
methods
!=
NULL
)
dns_rdataset_disassociate
(
rdataset
);
if
(
sigrdataset
->
methods
!=
NULL
)
...
...
@@ -544,7 +544,7 @@ query_simplefind(void *arg, dns_name_t *name, dns_rdatatype_t type,
/*
* We don't know the answer.
*/
result
=
DNS
_R_NOTFOUND
;
result
=
ISC
_R_NOTFOUND
;
}
else
if
(
result
==
DNS_R_GLUE
)
{
if
(
USECACHE
(
client
)
&&
RECURSIONOK
(
client
))
{
/*
...
...
@@ -572,7 +572,7 @@ query_simplefind(void *arg, dns_name_t *name, dns_rdatatype_t type,
dns_rdataset_disassociate
(
rdataset
);
if
(
sigrdataset
->
methods
!=
NULL
)
dns_rdataset_disassociate
(
sigrdataset
);
result
=
DNS
_R_NOTFOUND
;
result
=
ISC
_R_NOTFOUND
;
}
cleanup:
...
...
@@ -610,7 +610,7 @@ query_isduplicate(ns_client_t *client, dns_name_t *name,
*/
CTRACE
(
"query_isduplicate: true: done"
);
return
(
ISC_TRUE
);
}
else
if
(
result
==
DNS_R_NXR
DATA
SET
)
{
}
else
if
(
result
==
DNS_R_NXR
R
SET
)
{
/*
* The name exists, but the rdataset does not.
*/
...
...
@@ -686,16 +686,16 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
* Find a database to answer the query.
*/
result
=
dns_zt_find
(
client
->
view
->
zonetable
,
name
,
NULL
,
&
zone
);
if
(
result
==
DNS
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
{
if
(
result
==
ISC
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
{
isc_result_t
tresult
;
tresult
=
dns_zone_getdb
(
zone
,
&
db
);
if
(
tresult
!=
DNS
_R_SUCCESS
)
if
(
tresult
!=
ISC
_R_SUCCESS
)
result
=
tresult
;
}
if
(
result
==
ISC_R_NOTFOUND
&&
USECACHE
(
client
))
dns_db_attach
(
client
->
view
->
cachedb
,
&
db
);
else
if
(
result
!=
DNS
_R_SUCCESS
&&
result
!=
DNS_R_PARTIALMATCH
)
else
if
(
result
!=
ISC
_R_SUCCESS
&&
result
!=
DNS_R_PARTIALMATCH
)
goto
cleanup
;
/*
...
...
@@ -733,7 +733,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
client
->
now
,
&
node
,
fname
,
rdataset
,
sigrdataset
);
if
(
result
==
DNS_R_DELEGATION
||
result
==
DNS
_R_NOTFOUND
)
{
if
(
result
==
DNS_R_DELEGATION
||
result
==
ISC
_R_NOTFOUND
)
{
if
(
is_zone
)
{
if
(
USECACHE
(
client
))
{
/*
...
...
@@ -1239,7 +1239,7 @@ query_addrrset(ns_client_t *client, dns_name_t **namep,
*
namep
=
NULL
;
mname
=
name
;
}
else
RUNTIME_CHECK
(
result
==
DNS_R_NXR
DATA
SET
);
RUNTIME_CHECK
(
result
==
DNS_R_NXR
R
SET
);
/*
* Note: we only add SIGs if we've added the type they cover, so
...
...
@@ -1478,7 +1478,7 @@ query_addbestns(ns_client_t *client) {
*/
result
=
dns_zt_find
(
client
->
view
->
zonetable
,
client
->
query
.
qname
,
NULL
,
&
zone
);
if
(
result
==
DNS
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
if
(
result
==
ISC
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
result
=
dns_zone_getdb
(
zone
,
&
db
);
if
(
result
==
ISC_R_NOTFOUND
)
{
/*
...
...
@@ -1880,7 +1880,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
*/
result
=
dns_zt_find
(
client
->
view
->
zonetable
,
client
->
query
.
qname
,
NULL
,
&
zone
);
if
(
result
==
DNS
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
if
(
result
==
ISC
_R_SUCCESS
||
result
==
DNS_R_PARTIALMATCH
)
result
=
dns_zone_getdb
(
zone
,
&
db
);
if
(
result
==
ISC_R_NOTFOUND
)
{
...
...
@@ -1934,7 +1934,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
* XXX there should also be a per-view one.
*/
result
=
ns_client_checkacl
(
client
,
"query"
,
queryacl
,
ISC_TRUE
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
QUERY_ERROR
(
result
);
goto
cleanup
;
}
...
...
@@ -2018,7 +2018,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
resume:
CTRACE
(
"query_find: resume"
);
switch
(
result
)
{
case
DNS
_R_SUCCESS
:
case
ISC
_R_SUCCESS
:
/*
* This case is handled in the main line below.
*/
...
...
@@ -2031,7 +2031,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
INSIST
(
is_zone
);
authoritative
=
ISC_FALSE
;
break
;
case
DNS
_R_NOTFOUND
:
case
ISC
_R_NOTFOUND
:
/*
* The cache doesn't even have the root NS. Get them from
* the hints DB.
...
...
@@ -2163,7 +2163,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
}
}
goto
cleanup
;
case
DNS_R_NXR
DATA
SET
:
case
DNS_R_NXR
R
SET
:
INSIST
(
is_zone
);
if
(
dns_rdataset_isassociated
(
rdataset
))
{
/*
...
...
@@ -2474,7 +2474,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
* We didn't match any rdatasets.
*/
if
(
qtype
==
dns_rdatatype_sig
&&
result
==
DNS
_R_NOMORE
)
{
result
==
ISC
_R_NOMORE
)
{
/*
* XXXRTH If this is a secure zone and we
* didn't find any SIGs, we should generate
...
...
@@ -2494,7 +2494,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
*/
result
=
query_addsoa
(
client
,
db
);
if
(
result
==
ISC_R_SUCCESS
)
result
=
DNS
_R_NOMORE
;
result
=
ISC
_R_NOMORE
;
}
else
{
/*
* Something went wrong.
...
...
@@ -2503,7 +2503,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
}
}
dns_rdatasetiter_destroy
(
&
rdsiter
);
if
(
result
!=
DNS
_R_NOMORE
)
{
if
(
result
!=
ISC
_R_NOMORE
)
{
QUERY_ERROR
(
DNS_R_SERVFAIL
);
goto
cleanup
;
}
...
...
bin/named/server.c
View file @
41959049
...
...
@@ -1417,14 +1417,14 @@ ns_server_reload(isc_task_t *task, isc_event_t *event) {
UNUSED
(
task
);
result
=
load_configuration
(
ns_g_conffile
,
server
,
ISC_FALSE
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
isc_log_write
(
ns_g_lctx
,
NS_LOGCATEGORY_GENERAL
,
NS_LOGMODULE_SERVER
,
ISC_LOG_ERROR
,
"reloading configuration failed: %s"
,
isc_result_totext
(
result
));
}
result
=
load_zones
(
server
,
ISC_FALSE
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
isc_log_write
(
ns_g_lctx
,
NS_LOGCATEGORY_GENERAL
,
NS_LOGMODULE_SERVER
,
ISC_LOG_ERROR
,
"reloading zones failed: %s"
,
...
...
@@ -1465,7 +1465,7 @@ ns_listenlist_fromconfig(dns_c_lstnlist_t *clist, dns_c_ctx_t *cctx,
{
ns_listenelt_t
*
delt
=
NULL
;
result
=
ns_listenelt_fromconfig
(
ce
,
cctx
,
actx
,
mctx
,
&
delt
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup
;
ISC_LIST_APPEND
(
dlist
->
elts
,
delt
,
link
);
}
...
...
@@ -1494,7 +1494,7 @@ ns_listenelt_fromconfig(dns_c_lstnon_t *celt, dns_c_ctx_t *cctx,
return
(
result
);
result
=
dns_acl_fromconfig
(
celt
->
iml
,
cctx
,
actx
,
mctx
,
&
delt
->
acl
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
ns_listenelt_destroy
(
delt
);
return
(
result
);
}
...
...
bin/named/update.c
View file @
41959049
...
...
@@ -101,12 +101,12 @@
*/
#define CHECK(op) \
do { result = (op); \
if (result !=
DNS
_R_SUCCESS) goto failure; \
if (result !=
ISC
_R_SUCCESS) goto failure; \
} while (0)
/*
* Fail unconditionally with result 'code', which must not
* be
DNS
_R_SUCCESS. The reason for failure presumably has
* be
ISC
_R_SUCCESS. The reason for failure presumably has
* been logged already.
*/
...
...
@@ -191,7 +191,7 @@ do_one_tuple(dns_difftuple_t **tuple,
/* Apply it to the database. */
result
=
dns_diff_apply
(
&
temp_diff
,
db
,
ver
);
if
(
result
!=
DNS
_R_SUCCESS
)
{
if
(
result
!=
ISC
_R_SUCCESS
)
{
dns_difftuple_free
(
tuple
);
return
(
result
);
}
...
...
@@ -201,7 +201,7 @@ do_one_tuple(dns_difftuple_t **tuple,
/* Do not clear temp_diff. */
return
(
DNS
_R_SUCCESS
);
return
(
ISC
_R_SUCCESS
);
}
static
isc_result_t
...
...
@@ -213,7 +213,7 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff,
isc_result_t
result
;
result
=
dns_difftuple_create
(
diff
->
mctx
,
op
,
name
,
ttl
,
rdata
,
&
tuple
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
return
(
result
);
return
(
do_one_tuple
(
&
tuple
,
db
,
ver
,
diff
));
}
...
...
@@ -257,19 +257,19 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset)
isc_result_t
result
;
foreach_node_rr_ctx_t
*
ctx
=
data
;
for
(
result
=
dns_rdataset_first
(
rdataset
);
result
==
DNS
_R_SUCCESS
;
result
==
ISC
_R_SUCCESS
;
result
=
dns_rdataset_next
(
rdataset
))
{
rr_t
rr
;
dns_rdataset_current
(
rdataset
,
&
rr
.
rdata
);
rr
.
ttl
=
rdataset
->
ttl
;
result
=
(
*
ctx
->
rr_action
)(
ctx
->
rr_action_data
,
&
rr
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
return
(
result
);
}
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
return
(
result
);
return
(
DNS
_R_SUCCESS
);
return
(
ISC
_R_SUCCESS
);
}
/*
...
...
@@ -292,19 +292,19 @@ foreach_rrset(dns_db_t *db,
node
=
NULL
;
result
=
dns_db_findnode
(
db
,
name
,
ISC_FALSE
,
&
node
);
if
(
result
==
DNS
_R_NOTFOUND
)
return
(
DNS
_R_SUCCESS
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
==
ISC
_R_NOTFOUND
)
return
(
ISC
_R_SUCCESS
);
if
(
result
!=
ISC
_R_SUCCESS
)
return
(
result
);
iter
=
NULL
;
result
=
dns_db_allrdatasets
(
db
,
node
,
ver
,
(
isc_stdtime_t
)
0
,
&
iter
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup_node
;
for
(
result
=
dns_rdatasetiter_first
(
iter
);
result
==
DNS
_R_SUCCESS
;
result
==
ISC
_R_SUCCESS
;
result
=
dns_rdatasetiter_next
(
iter
))
{
dns_rdataset_t
rdataset
;
...
...
@@ -315,11 +315,11 @@ foreach_rrset(dns_db_t *db,
result
=
(
*
action
)(
action_data
,
&
rdataset
);
dns_rdataset_disassociate
(
&
rdataset
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup_iterator
;
}
if
(
result
==
DNS
_R_NOMORE
)
result
=
DNS
_R_SUCCESS
;
if
(
result
==
ISC
_R_NOMORE
)
result
=
ISC
_R_SUCCESS
;
cleanup_iterator:
dns_rdatasetiter_destroy
(
&
iter
);
...
...
@@ -382,35 +382,35 @@ foreach_rr(dns_db_t *db,
node
=
NULL
;
result
=
dns_db_findnode
(
db
,
name
,
ISC_FALSE
,
&
node
);
if
(
result
==
DNS
_R_NOTFOUND
)
return
(
DNS
_R_SUCCESS
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
==
ISC
_R_NOTFOUND
)
return
(
ISC
_R_SUCCESS
);
if
(
result
!=
ISC
_R_SUCCESS
)
return
(
result
);
dns_rdataset_init
(
&
rdataset
);
result
=
dns_db_findrdataset
(
db
,
node
,
ver
,
type
,
covers
,
(
isc_stdtime_t
)
0
,
&
rdataset
,
NULL
);
if
(
result
==
DNS
_R_NOTFOUND
)
{
result
=
DNS
_R_SUCCESS
;
if
(
result
==
ISC
_R_NOTFOUND
)
{
result
=
ISC
_R_SUCCESS
;
goto
cleanup_node
;
}
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup_node
;
for
(
result
=
dns_rdataset_first
(
&
rdataset
);
result
==
DNS
_R_SUCCESS
;
result
==
ISC
_R_SUCCESS
;
result
=
dns_rdataset_next
(
&
rdataset
))
{
rr_t
rr
;
dns_rdataset_current
(
&
rdataset
,
&
rr
.
rdata
);
rr
.
ttl
=
rdataset
.
ttl
;
result
=
(
*
rr_action
)(
rr_action_data
,
&
rr
);
if
(
result
!=
DNS
_R_SUCCESS
)
if
(
result
!=
ISC
_R_SUCCESS
)
goto
cleanup_rdataset
;
}
if
(
result
!=
DNS
_R_NOMORE
)
if
(
result
!=
ISC
_R_NOMORE
)
goto
cleanup_rdataset
;
result
=
DNS
_R_SUCCESS
;
result
=
ISC
_R_SUCCESS
;
cleanup_rdataset:
dns_rdataset_disassociate
(
&
rdataset
);
...
...
@@ -438,14 +438,14 @@ rrset_exists_action(void *data, rr_t *rr) /*ARGSUSED*/
{
UNUSED
(
data
);
UNUSED
(
rr
);
return
(
DNS
_R_EXISTS
);
return
(
ISC
_R_EXISTS
);
}
/*
* Utility macro for RR existence checking functions.
*
* If the variable 'result' has the value
DNS
_R_EXISTS or
*
DNS
_R_SUCCESS, set *exists to ISC_TRUE or ISC_FALSE,