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
2f012d93
Commit
2f012d93
authored
Jan 18, 2008
by
Automatic Updater
Browse files
update copyright notice
parent
2a446e8c
Changes
35
Expand all
Hide whitespace changes
Inline
Side-by-side
bin/check/check-tool.c
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check-tool.c,v 1.3
3
2008/01/
09
23:4
7:00
tbox Exp $ */
/* $Id: check-tool.c,v 1.3
4
2008/01/
18
23:4
6:57
tbox Exp $ */
/*! \file */
...
...
@@ -60,7 +60,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
} while (0)
} while (0)
#define ERR_IS_CNAME 1
#define ERR_NO_ADDRESSES 2
...
...
@@ -78,7 +78,7 @@ isc_boolean_t nomerge = ISC_TRUE;
isc_boolean_t
docheckmx
=
ISC_TRUE
;
isc_boolean_t
dochecksrv
=
ISC_TRUE
;
isc_boolean_t
docheckns
=
ISC_TRUE
;
unsigned
int
zone_options
=
DNS_ZONEOPT_CHECKNS
|
unsigned
int
zone_options
=
DNS_ZONEOPT_CHECKNS
|
DNS_ZONEOPT_CHECKMX
|
DNS_ZONEOPT_MANYERRORS
|
DNS_ZONEOPT_CHECKNAMES
|
...
...
@@ -109,7 +109,7 @@ freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) {
UNUSED
(
type
);
UNUSED
(
value
);
isc_mem_free
(
userarg
,
key
);
}
}
static
void
add
(
char
*
key
,
int
value
)
{
...
...
@@ -377,7 +377,7 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
if
(
dns_name_countlabels
(
name
)
>
1U
)
strcat
(
namebuf
,
"."
);
dns_name_format
(
owner
,
ownerbuf
,
sizeof
(
ownerbuf
));
result
=
getaddrinfo
(
namebuf
,
NULL
,
&
hints
,
&
ai
);
dns_name_format
(
name
,
namebuf
,
sizeof
(
namebuf
)
-
1
);
switch
(
result
)
{
...
...
@@ -462,7 +462,7 @@ checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
if
(
dns_name_countlabels
(
name
)
>
1U
)
strcat
(
namebuf
,
"."
);
dns_name_format
(
owner
,
ownerbuf
,
sizeof
(
ownerbuf
));
result
=
getaddrinfo
(
namebuf
,
NULL
,
&
hints
,
&
ai
);
dns_name_format
(
name
,
namebuf
,
sizeof
(
namebuf
)
-
1
);
switch
(
result
)
{
...
...
bin/dig/dighost.c
View file @
2f012d93
This diff is collapsed.
Click to expand it.
bin/named/client.c
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.25
2
2008/01/
02
23:4
7:01
tbox Exp $ */
/* $Id: client.c,v 1.25
3
2008/01/
18
23:4
6:57
tbox Exp $ */
#include <config.h>
...
...
@@ -132,7 +132,7 @@ struct ns_clientmgr {
#define MANAGER_MAGIC ISC_MAGIC('N', 'S', 'C', 'm')
#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, MANAGER_MAGIC)
/*!
/*!
* Client object states. Ordering is significant: higher-numbered
* states are generally "more active", meaning that the client can
* have more dynamically allocated data, outstanding events, etc.
...
...
@@ -286,7 +286,7 @@ exit_check(ns_client_t *client) {
*
* Keep the view attached until any outstanding updates complete.
*/
if
(
client
->
nupdates
==
0
&&
if
(
client
->
nupdates
==
0
&&
client
->
newstate
==
NS_CLIENTSTATE_FREED
&&
client
->
view
!=
NULL
)
dns_view_detach
(
&
client
->
view
);
...
...
@@ -845,7 +845,7 @@ client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) {
isc_buffer_usedregion
(
buffer
,
&
r
);
CTRACE
(
"sendto"
);
result
=
isc_socket_sendto2
(
socket
,
&
r
,
client
->
task
,
address
,
pktinfo
,
client
->
sendevent
,
sockflags
);
...
...
@@ -1119,8 +1119,8 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
/*
* FORMERR loop avoidance: If we sent a FORMERR message
* with the same ID to the same client less than two
* seconds ago, assume that we are in an infinite error
* packet dialog with a server for some protocol whose
* seconds ago, assume that we are in an infinite error
* packet dialog with a server for some protocol whose
* error responses look enough like DNS queries to
* elicit a FORMERR response. Drop a packet to break
* the loop.
...
...
@@ -1553,7 +1553,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
* For IPv6 UDP queries, we get this from the pktinfo structure (if
* supported).
* If all the attempts fail (this can happen due to memory shortage,
* etc), we regard this as an error for safety.
* etc), we regard this as an error for safety.
*/
if
((
client
->
interface
->
flags
&
NS_INTERFACEFLAG_ANYADDR
)
==
0
)
isc_netaddr_fromsockaddr
(
&
destaddr
,
&
client
->
interface
->
addr
);
...
...
@@ -2507,12 +2507,12 @@ ns_client_checkaclsilent(ns_client_t *client, isc_sockaddr_t *sockaddr,
goto
deny
;
}
if
(
sockaddr
==
NULL
)
isc_netaddr_fromsockaddr
(
&
netaddr
,
&
client
->
peeraddr
);
else
isc_netaddr_fromsockaddr
(
&
netaddr
,
sockaddr
);
result
=
dns_acl_match
(
&
netaddr
,
client
->
signer
,
acl
,
&
ns_g_server
->
aclenv
,
&
match
,
NULL
);
...
...
@@ -2538,7 +2538,7 @@ ns_client_checkacl(ns_client_t *client, isc_sockaddr_t *sockaddr,
isc_result_t
result
=
ns_client_checkaclsilent
(
client
,
sockaddr
,
acl
,
default_allow
);
if
(
result
==
ISC_R_SUCCESS
)
if
(
result
==
ISC_R_SUCCESS
)
ns_client_log
(
client
,
DNS_LOGCATEGORY_SECURITY
,
NS_LOGMODULE_CLIENT
,
ISC_LOG_DEBUG
(
3
),
"%s approved"
,
opname
);
...
...
@@ -2594,7 +2594,7 @@ ns_client_log(ns_client_t *client, isc_logcategory_t *category,
void
ns_client_aclmsg
(
const
char
*
msg
,
dns_name_t
*
name
,
dns_rdatatype_t
type
,
dns_rdataclass_t
rdclass
,
char
*
buf
,
size_t
len
)
dns_rdataclass_t
rdclass
,
char
*
buf
,
size_t
len
)
{
char
namebuf
[
DNS_NAME_FORMATSIZE
];
char
typebuf
[
DNS_RDATATYPE_FORMATSIZE
];
...
...
bin/named/controlconf.c
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: controlconf.c,v 1.5
7
2008/01/1
7
23:46:5
9
tbox Exp $ */
/* $Id: controlconf.c,v 1.5
8
2008/01/1
8
23:46:5
7
tbox Exp $ */
/*! \file */
...
...
@@ -345,9 +345,9 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
listener
=
conn
->
listener
;
secret
.
rstart
=
NULL
;
/* Is the server shutting down? */
if
(
listener
->
controls
->
shuttingdown
)
goto
cleanup
;
/* Is the server shutting down? */
if
(
listener
->
controls
->
shuttingdown
)
goto
cleanup
;
if
(
conn
->
ccmsg
.
result
!=
ISC_R_SUCCESS
)
{
if
(
conn
->
ccmsg
.
result
!=
ISC_R_CANCELED
&&
...
...
@@ -434,7 +434,7 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
result
=
isccc_cc_checkdup
(
listener
->
controls
->
symtab
,
request
,
now
);
if
(
result
!=
ISC_R_SUCCESS
)
{
if
(
result
==
ISC_R_EXISTS
)
result
=
ISCCC_R_DUPLICATE
;
result
=
ISCCC_R_DUPLICATE
;
log_invalid
(
&
conn
->
ccmsg
,
result
);
goto
cleanup_request
;
}
...
...
@@ -542,7 +542,7 @@ newconnection(controllistener_t *listener, isc_socket_t *sock) {
conn
=
isc_mem_get
(
listener
->
mctx
,
sizeof
(
*
conn
));
if
(
conn
==
NULL
)
return
(
ISC_R_NOMEMORY
);
conn
->
sock
=
sock
;
isccc_ccmsg_init
(
listener
->
mctx
,
sock
,
&
conn
->
ccmsg
);
conn
->
ccmsg_valid
=
ISC_TRUE
;
...
...
@@ -655,7 +655,7 @@ ns_controls_shutdown(ns_controls_t *controls) {
static
isc_result_t
cfgkeylist_find
(
const
cfg_obj_t
*
keylist
,
const
char
*
keyname
,
const
cfg_obj_t
**
objp
)
const
cfg_obj_t
**
objp
)
{
const
cfg_listelt_t
*
element
;
const
char
*
str
;
...
...
@@ -803,7 +803,7 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist,
if (result != ISC_R_SUCCESS) \
goto cleanup; \
} while (0)
static
isc_result_t
get_rndckey
(
isc_mem_t
*
mctx
,
controlkeylist_t
*
keyids
)
{
isc_result_t
result
;
...
...
@@ -823,14 +823,14 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
CHECK
(
cfg_map_get
(
config
,
"key"
,
&
key
));
keyid
=
isc_mem_get
(
mctx
,
sizeof
(
*
keyid
));
if
(
keyid
==
NULL
)
if
(
keyid
==
NULL
)
CHECK
(
ISC_R_NOMEMORY
);
keyid
->
keyname
=
isc_mem_strdup
(
mctx
,
cfg_obj_asstring
(
cfg_map_getname
(
key
)));
keyid
->
secret
.
base
=
NULL
;
keyid
->
secret
.
length
=
0
;
ISC_LINK_INIT
(
keyid
,
link
);
if
(
keyid
->
keyname
==
NULL
)
if
(
keyid
->
keyname
==
NULL
)
CHECK
(
ISC_R_NOMEMORY
);
CHECK
(
bind9_check_key
(
key
,
ns_g_lctx
));
...
...
@@ -886,7 +886,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
cfg_parser_destroy
(
&
pctx
);
return
(
result
);
}
/*
* Ensures that both '*global_keylistp' and '*control_keylistp' are
* valid or both are NULL.
...
...
@@ -920,7 +920,7 @@ static void
update_listener
(
ns_controls_t
*
cp
,
controllistener_t
**
listenerp
,
const
cfg_obj_t
*
control
,
const
cfg_obj_t
*
config
,
isc_sockaddr_t
*
addr
,
cfg_aclconfctx_t
*
aclconfctx
,
const
char
*
socktext
,
isc_sockettype_t
type
)
const
char
*
socktext
,
isc_sockettype_t
type
)
{
controllistener_t
*
listener
;
const
cfg_obj_t
*
allow
;
...
...
@@ -940,7 +940,7 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp,
*
listenerp
=
NULL
;
return
;
}
/*
* There is already a listener for this sockaddr.
* Update the access list and key information.
...
...
@@ -1096,7 +1096,7 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp,
allow
=
cfg_tuple_get
(
control
,
"allow"
);
result
=
cfg_acl_fromconfig
(
allow
,
config
,
ns_g_lctx
,
aclconfctx
,
mctx
,
0
,
&
new_acl
);
&
new_acl
);
}
else
{
result
=
dns_acl_any
(
mctx
,
&
new_acl
);
}
...
...
@@ -1337,7 +1337,7 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
update_listener
(
cp
,
&
listener
,
control
,
config
,
&
addr
,
aclconfctx
,
cfg_obj_asstring
(
path
),
cfg_obj_asstring
(
path
),
isc_sockettype_unix
);
if
(
listener
!=
NULL
)
...
...
@@ -1383,10 +1383,10 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
isc_sockaddr_setport
(
&
addr
,
NS_CONTROL_PORT
);
isc_sockaddr_format
(
&
addr
,
socktext
,
sizeof
(
socktext
));
update_listener
(
cp
,
&
listener
,
NULL
,
NULL
,
&
addr
,
NULL
,
socktext
,
isc_sockettype_tcp
);
isc_sockettype_tcp
);
if
(
listener
!=
NULL
)
/*
...
...
bin/named/include/named/client.h
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.h,v 1.8
4
2008/01/
02
23:4
7:01
tbox Exp $ */
/* $Id: client.h,v 1.8
5
2008/01/
18
23:4
6:57
tbox Exp $ */
#ifndef NAMED_CLIENT_H
#define NAMED_CLIENT_H 1
...
...
@@ -24,7 +24,7 @@
***** Module Info
*****/
/*! \file
/*! \file
* \brief
* This module defines two objects, ns_client_t and ns_clientmgr_t.
*
...
...
@@ -365,8 +365,8 @@ ns_client_qnamereplace(ns_client_t *client, dns_name_t *name);
isc_boolean_t
ns_client_isself
(
dns_view_t
*
myview
,
dns_tsigkey_t
*
mykey
,
isc_sockaddr_t
*
srcaddr
,
isc_sockaddr_t
*
destaddr
,
dns_rdataclass_t
rdclass
,
void
*
arg
);
isc_sockaddr_t
*
srcaddr
,
isc_sockaddr_t
*
destaddr
,
dns_rdataclass_t
rdclass
,
void
*
arg
);
/*%
* Isself callback.
*/
...
...
bin/named/include/named/server.h
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.h,v 1.9
0
2008/01/1
7
23:46:5
9
tbox Exp $ */
/* $Id: server.h,v 1.9
1
2008/01/1
8
23:46:5
7
tbox Exp $ */
#ifndef NAMED_SERVER_H
#define NAMED_SERVER_H 1
...
...
@@ -63,7 +63,7 @@ struct ns_server {
isc_boolean_t
server_usehostname
;
char
*
server_id
;
/*%< User-specified server id */
/*%
/*%
* Current ACL environment. This defines the
* current values of the localhost and localnets
* ACLs.
...
...
bin/named/main.c
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.16
0
2008/01/
02
23:4
7:01
tbox Exp $ */
/* $Id: main.c,v 1.16
1
2008/01/
18
23:4
6:57
tbox Exp $ */
/*! \file */
...
...
@@ -356,7 +356,7 @@ parse_command_line(int argc, char *argv[]) {
isc_commandline_errprint
=
ISC_FALSE
;
while
((
ch
=
isc_commandline_parse
(
argc
,
argv
,
"46c:C:d:fgi:lm:n:N:p:P:st:T:u:vx:"
))
!=
-
1
)
{
"46c:C:d:fgi:lm:n:N:p:P:st:T:u:vx:"
))
!=
-
1
)
{
switch
(
ch
)
{
case
'4'
:
if
(
disable4
)
...
...
@@ -678,7 +678,7 @@ setup(void) {
sizeof
(
absolute_conffile
));
if
(
result
!=
ISC_R_SUCCESS
)
ns_main_earlyfatal
(
"could not construct absolute path of "
"configuration file: %s"
,
"configuration file: %s"
,
isc_result_totext
(
result
));
ns_g_conffile
=
absolute_conffile
;
}
...
...
@@ -778,7 +778,7 @@ ns_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
if
(
debug
)
UNEXPECTED_ERROR
(
__FILE__
,
__LINE__
,
"scf_handle_create() failed: %s"
,
scf_strerror
(
scf_error
()));
scf_strerror
(
scf_error
()));
return
(
ISC_R_FAILURE
);
}
...
...
bin/named/query.c
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.30
1
2008/01/
09 04:09:12 marka
Exp $ */
/* $Id: query.c,v 1.30
2
2008/01/
18 23:46:57 tbox
Exp $ */
/*! \file */
...
...
@@ -2299,7 +2299,7 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
static
isc_boolean_t
get_key
(
ns_client_t
*
client
,
dns_db_t
*
db
,
dns_rdata_rrsig_t
*
rrsig
,
dns_rdataset_t
*
keyrdataset
,
dst_key_t
**
keyp
)
{
{
isc_result_t
result
;
dns_dbnode_t
*
node
=
NULL
;
isc_boolean_t
secure
=
ISC_FALSE
;
...
...
@@ -2332,12 +2332,12 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig,
isc_buffer_init
(
&
b
,
rdata
.
data
,
rdata
.
length
);
isc_buffer_add
(
&
b
,
rdata
.
length
);
result
=
dst_key_fromdns
(
&
rrsig
->
signer
,
rdata
.
rdclass
,
&
b
,
client
->
mctx
,
keyp
);
client
->
mctx
,
keyp
);
if
(
result
!=
ISC_R_SUCCESS
)
continue
;
if
(
rrsig
->
algorithm
==
(
dns_secalg_t
)
dst_key_alg
(
*
keyp
)
&&
rrsig
->
keyid
==
(
dns_keytag_t
)
dst_key_id
(
*
keyp
)
&&
dst_key_iszonekey
(
*
keyp
))
{
rrsig
->
keyid
==
(
dns_keytag_t
)
dst_key_id
(
*
keyp
)
&&
dst_key_iszonekey
(
*
keyp
))
{
secure
=
ISC_TRUE
;
break
;
}
...
...
@@ -2355,7 +2355,7 @@ verify(dst_key_t *key, dns_name_t *name, dns_rdataset_t *rdataset,
isc_boolean_t
ignore
=
ISC_FALSE
;
dns_fixedname_init
(
&
fixed
);
again:
result
=
dns_dnssec_verify2
(
name
,
rdataset
,
key
,
ignore
,
mctx
,
rdata
,
NULL
);
...
...
@@ -2383,7 +2383,7 @@ validate(ns_client_t *client, dns_db_t *db, dns_name_t *name,
if
(
sigrdataset
==
NULL
||
!
dns_rdataset_isassociated
(
sigrdataset
))
return
(
ISC_FALSE
);
for
(
result
=
dns_rdataset_first
(
sigrdataset
);
result
==
ISC_R_SUCCESS
;
result
=
dns_rdataset_next
(
sigrdataset
))
{
...
...
@@ -3163,11 +3163,11 @@ query_addnoqnameproof(ns_client_t *client, dns_rdataset_t *rdataset) {
cleanup:
if
(
nsec
!=
NULL
)
query_putrdataset
(
client
,
&
nsec
);
if
(
nsecsig
!=
NULL
)
query_putrdataset
(
client
,
&
nsecsig
);
if
(
fname
!=
NULL
)
query_releasename
(
client
,
&
fname
);
query_putrdataset
(
client
,
&
nsec
);
if
(
nsecsig
!=
NULL
)
query_putrdataset
(
client
,
&
nsecsig
);
if
(
fname
!=
NULL
)
query_releasename
(
client
,
&
fname
);
}
static
inline
void
...
...
@@ -3270,12 +3270,12 @@ warn_rfc1918(ns_client_t *client, dns_name_t *fname, dns_rdataset_t *rdataset) {
dns_rdata_soa_t
soa
;
dns_rdataset_t
found
;
isc_result_t
result
;
for
(
i
=
0
;
i
<
(
sizeof
(
rfc1918names
)
/
sizeof
(
*
rfc1918names
));
i
++
)
{
if
(
dns_name_issubdomain
(
fname
,
&
rfc1918names
[
i
]))
{
dns_rdataset_init
(
&
found
);
result
=
dns_ncache_getrdataset
(
rdataset
,
&
rfc1918names
[
i
],
&
rfc1918names
[
i
],
dns_rdatatype_soa
,
&
found
);
if
(
result
!=
ISC_R_SUCCESS
)
...
...
bin/named/server.c
View file @
2f012d93
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.49
8
2008/01/1
7 00:15:13 jinmei
Exp $ */
/* $Id: server.c,v 1.49
9
2008/01/1
8 23:46:57 tbox
Exp $ */
/*! \file */
...
...
@@ -301,8 +301,8 @@ configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config,
*/
static
isc_result_t
configure_view_sortlist
(
const
cfg_obj_t
*
vconfig
,
const
cfg_obj_t
*
config
,
cfg_aclconfctx_t
*
actx
,
isc_mem_t
*
mctx
,
dns_acl_t
**
aclp
)
cfg_aclconfctx_t
*
actx
,
isc_mem_t
*
mctx
,
dns_acl_t
**
aclp
)
{
isc_result_t
result
;
const
cfg_obj_t
*
maps
[
3
];
...
...
@@ -325,12 +325,12 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config,
if
(
aclobj
==
NULL
)
return
(
ISC_R_SUCCESS
);
/*
* Use a nest level of 3 for the "top level" of the sortlist;
* this means each entry in the top three levels will be stored
* as lists of separate, nested ACLs, rather than merged together
* into IP tables as is usually done with ACLs.
*/
/*
* Use a nest level of 3 for the "top level" of the sortlist;
* this means each entry in the top three levels will be stored
* as lists of separate, nested ACLs, rather than merged together
* into IP tables as is usually done with ACLs.
*/
result
=
cfg_acl_fromconfig
(
aclobj
,
config
,
ns_g_lctx
,
actx
,
mctx
,
3
,
aclp
);
...
...
@@ -489,7 +489,7 @@ configure_view_dnsseckeys(const cfg_obj_t *vconfig, const cfg_obj_t *config,
*
target
=
keytable
;
/* Transfer ownership. */
keytable
=
NULL
;
result
=
ISC_R_SUCCESS
;
cleanup:
return
(
result
);
}
...
...
@@ -505,7 +505,7 @@ mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver)
isc_boolean_t
value
;
isc_result_t
result
;
isc_buffer_t
b
;
dns_fixedname_init
(
&
fixed
);
name
=
dns_fixedname_name
(
&
fixed
);
for
(
element
=
cfg_list_first
(
mbs
);
...
...
@@ -523,7 +523,7 @@ mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver)
}
result
=
ISC_R_SUCCESS
;
cleanup:
return
(
result
);
}
...
...
@@ -883,7 +883,7 @@ on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) {
dns_fixedname_init
(
&
fixed
);
name
=
dns_fixedname_name
(
&
fixed
);
for
(
element
=
cfg_list_first
(
disablelist
);
element
!=
NULL
;
element
=
cfg_list_next
(
element
))
...
...
@@ -1108,7 +1108,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
result
=
ISC_R_NOMEMORY
;
goto
cleanup
;
}
result
=
dns_dlzstrtoargv
(
mctx
,
s
,
&
dlzargc
,
&
dlzargv
);
if
(
result
!=
ISC_R_SUCCESS
)
{
isc_mem_free
(
mctx
,
s
);
...
...
@@ -1361,7 +1361,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
if
(
udpsize
>
4096
)
udpsize
=
4096
;
dns_resolver_setudpsize
(
view
->
resolver
,
(
isc_uint16_t
)
udpsize
);
/*
* Set the maximum UDP response size.
*/
...
...
@@ -1541,7 +1541,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
view
->
transfer_format
=
dns_one_answer
;
else
INSIST
(
0
);
/*
* Set sources where additional data and CNAME/DNAME
* targets for authoritative answers may be found.
...
...
@@ -1623,11 +1623,11 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
"allow-query-cache"
,
actx
,
ns_g_mctx
,
&
view
->
queryacl
));
/*
* Configure sortlist, if set
*/
/*
* Configure sortlist, if set
*/
CHECK
(
configure_view_sortlist
(
vconfig
,
config
,
actx
,
ns_g_mctx
,
&
view
->
sortlist
));
&
view
->
sortlist
));
obj
=
NULL
;
result
=
ns_config_get
(
maps
,
"request-ixfr"
,
&
obj
);
...
...
@@ -1650,7 +1650,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
dns_resolver_setclientsperquery
(
view
->
resolver
,
cfg_obj_asuint32
(
obj
),
max_clients_per_query
);
obj
=
NULL
;
result
=
ns_config_get
(
maps
,
"dnssec-enable"
,
&
obj
);
INSIST
(
result
==
ISC_R_SUCCESS
);
...
...
@@ -1879,7 +1879,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
if
(
result
==
ISC_R_SUCCESS
&&
forwarders
->
fwdpolicy
==
dns_fwdpolicy_only
)
continue
;
if
(
!
rfc1918
&&
empty_zones
[
empty_zone
].
rfc1918
)
{
if
(
logit
)
{
isc_log_write
(
ns_g_lctx
,
...
...
@@ -1945,7 +1945,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
dns_zone_detach
(
&
zone
);
}
}
result
=
ISC_R_SUCCESS
;
cleanup:
...
...
@@ -2261,7 +2261,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
"name"
));
else
vname
=
"<default view>"
;
isc_log_write
(
ns_g_lctx
,
NS_LOGCATEGORY_GENERAL
,
NS_LOGMODULE_SERVER
,
ISC_LOG_ERROR
,
"zone '%s': wrong class for view '%s'"
,
...
...
@@ -2520,7 +2520,7 @@ add_listenelt(isc_mem_t *mctx, ns_listenlist_t *list, isc_sockaddr_t *addr,
dns_acl_t
*
src_acl
=
NULL
;
isc_result_t
result
;
isc_sockaddr_t
any_sa6
;
isc_netaddr_t
netaddr
;
isc_netaddr_t
netaddr
;
REQUIRE
(
isc_sockaddr_pf
(
addr
)
==
AF_INET6
);
...
...
@@ -2528,13 +2528,13 @@ add_listenelt(isc_mem_t *mctx, ns_listenlist_t *list, isc_sockaddr_t *addr,
if
(
!
isc_sockaddr_equal
(
&
any_sa6
,
addr
)
&&
(
wcardport_ok
||
isc_sockaddr_getport
(
addr
)
!=
0
))
{
isc_netaddr_fromin6
(
&
netaddr
,
&
addr
->
type
.
sin6
.
sin6_addr
);
result
=
dns_acl_create
(
mctx
,
0
,
&
src_acl
);
if
(
result
!=
ISC_R_SUCCESS
)
return
(
result
);
result
=
dns_iptable_addprefix
(
src_acl
->
iptable
,
&
netaddr
,
128
,
ISC_TRUE
);
result
=
dns_iptable_addprefix
(
src_acl
->
iptable
,
&
netaddr
,
128
,
ISC_TRUE
);
if
(
result
!=
ISC_R_SUCCESS
)
goto
clean
;
...
...
@@ -2638,7 +2638,7 @@ adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) {
}
ns_interfacemgr_adjust
(
server
->
interfacemgr
,
list
,
ISC_TRUE
);
clean:
ns_listenlist_detach
(
&
list
);
return
;
...
...
@@ -2727,7 +2727,7 @@ setstring(ns_server_t *server, char **field, const char *value) {
*
field
=
copy
;
return
(
ISC_R_SUCCESS
);
}
}
/*
* Replace the current value of '*field', a dynamically allocated
...
...
@@ -2798,7 +2798,7 @@ portlist_fromconf(dns_portlist_t *portlist, unsigned int family,
element
=
cfg_list_next
(
element
))
{
const
cfg_obj_t
*
obj
=
cfg_listelt_value
(
element
);
in_port_t
port
=
(
in_port_t
)
cfg_obj_asuint32
(
obj
);
result
=
dns_portlist_add
(
portlist
,
family
,
port
);
if
(
result
!=
ISC_R_SUCCESS
)
break
;
...
...
@@ -2862,7 +2862,7 @@ load_configuration(const char *filename, ns_server_t *server,
/* Ensure exclusive access to configuration data. */
result
=
isc_task_beginexclusive
(
server
->
task
);
RUNTIME_CHECK
(
result
==
ISC_R_SUCCESS
);
RUNTIME_CHECK
(
result
==
ISC_R_SUCCESS
);
/*
* Parse the global default pseudo-config file.
...
...
@@ -3149,7 +3149,7 @@ load_configuration(const char *filename, ns_server_t *server,
NULL
,
&
interval
,
ISC_FALSE
));
}