Skip to content
GitLab
Menu
Projects
Groups
Snippets
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
0874abad
Commit
0874abad
authored
Mar 11, 2011
by
Mark Andrews
Browse files
3069. [cleanup] Silence warnings messages from clang static analysis.
[RT #20256]
parent
6c77f400
Changes
76
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
0874abad
3069. [cleanup] Silence warnings messages from clang static analysis.
[RT #20256]
3068. [bug] Named failed to build with a OpenSSL without engine
support. [RT #23473]
...
...
bin/check/named-checkconf.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkconf.c,v 1.5
4
201
0
/0
9/07 01:49:08
marka Exp $ */
/* $Id: named-checkconf.c,v 1.5
5
201
1
/0
3/11 06:11:20
marka Exp $ */
/*! \file */
...
...
@@ -190,7 +190,7 @@ configure_zone(const char *vclass, const char *view,
if
(
obj
!=
NULL
)
maps
[
i
++
]
=
obj
;
}
maps
[
i
++
]
=
NULL
;
maps
[
i
]
=
NULL
;
cfg_map_get
(
zoptions
,
"type"
,
&
typeobj
);
if
(
typeobj
==
NULL
)
...
...
bin/confgen/ddns-confgen.c
View file @
0874abad
...
...
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ddns-confgen.c,v 1.
9
20
09/09/29 15:06:05 fdupont
Exp $ */
/* $Id: ddns-confgen.c,v 1.
10
20
11/03/11 06:11:20 marka
Exp $ */
/*! \file */
...
...
@@ -160,6 +160,7 @@ main(int argc, char **argv) {
argc
-=
isc_commandline_index
;
argv
+=
isc_commandline_index
;
POST
(
argv
);
if
(
self_domain
!=
NULL
&&
zone
!=
NULL
)
usage
(
1
);
/* -s and -z cannot coexist */
...
...
bin/confgen/rndc-confgen.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rndc-confgen.c,v 1.
5
20
09/09/29 15:06:05 fdupont
Exp $ */
/* $Id: rndc-confgen.c,v 1.
6
20
11/03/11 06:11:20 marka
Exp $ */
/*! \file */
...
...
@@ -200,6 +200,7 @@ main(int argc, char **argv) {
argc
-=
isc_commandline_index
;
argv
+=
isc_commandline_index
;
POST
(
argv
);
if
(
argc
>
0
)
usage
(
1
);
...
...
bin/dig/dig.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.24
1
2011/03/
05 23:52:29 tbox
Exp $ */
/* $Id: dig.c,v 1.24
2
2011/03/
11 06:11:20 marka
Exp $ */
/*! \file */
...
...
@@ -495,8 +495,6 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
if
(
!
query
->
lookup
->
comments
)
flags
|=
DNS_MESSAGETEXTFLAG_NOCOMMENTS
;
result
=
ISC_R_SUCCESS
;
result
=
isc_buffer_allocate
(
mctx
,
&
buf
,
len
);
check_result
(
result
,
"isc_buffer_allocate"
);
...
...
@@ -1622,7 +1620,6 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
(
isc_textregion_t
*
)
&
tr
);
if
(
result
==
ISC_R_SUCCESS
&&
rdtype
==
dns_rdatatype_ixfr
)
{
result
=
DNS_R_UNKNOWN
;
fprintf
(
stderr
,
";; Warning, "
"ixfr requires a "
"serial number
\n
"
);
...
...
bin/dig/dighost.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dighost.c,v 1.3
39
2011/0
2/25 23:11:13 each
Exp $ */
/* $Id: dighost.c,v 1.3
40
2011/0
3/11 06:11:20 marka
Exp $ */
/*! \file
* \note
...
...
@@ -1804,17 +1804,25 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section)
if
(
numLookups
>
1
)
{
isc_uint32_t
i
,
j
;
dig_serverlist_t
my_server_list
;
dig_server_t
*
next
;
ISC_LIST_INIT
(
my_server_list
);
for
(
i
=
numLookups
;
i
>
0
;
i
--
)
{
i
=
numLookups
;
for
(
srv
=
ISC_LIST_HEAD
(
lookup
->
my_server_list
);
srv
!=
NULL
;
srv
=
ISC_LIST_HEAD
(
lookup
->
my_server_list
))
{
INSIST
(
i
>
0
);
isc_random_get
(
&
j
);
j
%=
i
;
srv
=
ISC_LIST_HEAD
(
lookup
->
my_server_list
);
while
(
j
--
>
0
)
srv
=
ISC_LIST_NEXT
(
srv
,
link
);
next
=
ISC_LIST_NEXT
(
srv
,
link
);
while
(
j
--
>
0
&&
next
!=
NULL
)
{
srv
=
next
;
next
=
ISC_LIST_NEXT
(
srv
,
link
);
}
ISC_LIST_DEQUEUE
(
lookup
->
my_server_list
,
srv
,
link
);
ISC_LIST_APPEND
(
my_server_list
,
srv
,
link
);
i
--
;
}
ISC_LIST_APPENDLIST
(
lookup
->
my_server_list
,
my_server_list
,
link
);
...
...
bin/dig/host.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: host.c,v 1.12
6
2011/0
2/21 23:47:44 tbox
Exp $ */
/* $Id: host.c,v 1.12
7
2011/0
3/11 06:11:20 marka
Exp $ */
/*! \file */
...
...
@@ -521,6 +521,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
if
((
msg
->
flags
&
DNS_MESSAGEFLAG_CD
)
!=
0
)
{
printf
(
"%scd"
,
did_flag
?
" "
:
""
);
did_flag
=
ISC_TRUE
;
POST
(
did_flag
);
}
printf
(
"; QUERY: %u, ANSWER: %u, "
"AUTHORITY: %u, ADDITIONAL: %u
\n
"
,
...
...
bin/dnssec/dnssec-keyfromlabel.c
View file @
0874abad
...
...
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-keyfromlabel.c,v 1.3
2
201
0/12/23 04:07:59
marka Exp $ */
/* $Id: dnssec-keyfromlabel.c,v 1.3
3
201
1/03/11 06:11:20
marka Exp $ */
/*! \file */
...
...
@@ -518,6 +518,9 @@ main(int argc, char **argv) {
{
isc_buffer_clear
(
&
buf
);
ret
=
dst_key_buildfilename
(
key
,
0
,
directory
,
&
buf
);
if
(
ret
!=
ISC_R_SUCCESS
)
fatal
(
"dst_key_buildfilename returned: %s
\n
"
,
isc_result_totext
(
ret
));
if
(
exact
)
fatal
(
"%s: %s already exists
\n
"
,
program
,
filename
);
...
...
@@ -542,6 +545,9 @@ main(int argc, char **argv) {
isc_buffer_clear
(
&
buf
);
ret
=
dst_key_buildfilename
(
key
,
0
,
NULL
,
&
buf
);
if
(
ret
!=
ISC_R_SUCCESS
)
fatal
(
"dst_key_buildfilename returned: %s
\n
"
,
isc_result_totext
(
ret
));
printf
(
"%s
\n
"
,
filename
);
dst_key_free
(
&
key
);
...
...
bin/dnssec/dnssec-keygen.c
View file @
0874abad
...
...
@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-keygen.c,v 1.11
5
201
0/12/23 04:07:59
marka Exp $ */
/* $Id: dnssec-keygen.c,v 1.11
6
201
1/03/11 06:11:20
marka Exp $ */
/*! \file */
...
...
@@ -975,12 +975,15 @@ main(int argc, char **argv) {
if
(
verbose
>
0
)
{
isc_buffer_clear
(
&
buf
);
dst_key_buildfilename
(
key
,
0
,
directory
,
&
buf
);
fprintf
(
stderr
,
"%s: %s already exists, or might "
"collide with another key upon "
"revokation. Generating a new key
\n
"
,
program
,
filename
);
ret
=
dst_key_buildfilename
(
key
,
0
,
directory
,
&
buf
);
if
(
ret
==
ISC_R_SUCCESS
)
fprintf
(
stderr
,
"%s: %s already exists, or "
"might collide with another "
"key upon revokation. "
"Generating a new key
\n
"
,
program
,
filename
);
}
dst_key_free
(
&
key
);
...
...
@@ -1001,6 +1004,9 @@ main(int argc, char **argv) {
isc_buffer_clear
(
&
buf
);
ret
=
dst_key_buildfilename
(
key
,
0
,
NULL
,
&
buf
);
if
(
ret
!=
ISC_R_SUCCESS
)
fatal
(
"dst_key_buildfilename returned: %s
\n
"
,
isc_result_totext
(
ret
));
printf
(
"%s
\n
"
,
filename
);
dst_key_free
(
&
key
);
if
(
prevkey
!=
NULL
)
...
...
bin/dnssec/dnssec-signzone.c
View file @
0874abad
...
...
@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signzone.c,v 1.2
69
2011/03/1
0 13:37:21 fdupont
Exp $ */
/* $Id: dnssec-signzone.c,v 1.2
70
2011/03/1
1 06:11:20 marka
Exp $ */
/*! \file */
...
...
@@ -479,16 +479,10 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name,
char
namestr
[
DNS_NAME_FORMATSIZE
];
char
typestr
[
TYPE_FORMATSIZE
];
char
sigstr
[
SIG_FORMATSIZE
];
isc_stdtime_t
expiry
;
dns_name_format
(
name
,
namestr
,
sizeof
(
namestr
));
type_format
(
set
->
type
,
typestr
,
sizeof
(
typestr
));
if
(
set
->
type
==
dns_rdatatype_dnskey
)
expiry
=
dnskey_endtime
;
else
expiry
=
endtime
;
ttl
=
ISC_MIN
(
set
->
ttl
,
endtime
-
starttime
);
dns_rdataset_init
(
&
sigset
);
...
...
@@ -1543,7 +1537,6 @@ verifyzone(void) {
isc_boolean_t
done
=
ISC_FALSE
;
isc_boolean_t
first
=
ISC_TRUE
;
isc_boolean_t
goodksk
=
ISC_FALSE
;
isc_boolean_t
goodzsk
=
ISC_FALSE
;
isc_result_t
result
;
unsigned
char
revoked_ksk
[
256
];
unsigned
char
revoked_zsk
[
256
];
...
...
@@ -1645,7 +1638,6 @@ verifyzone(void) {
#endif
if
(
zsk_algorithms
[
dnskey
.
algorithm
]
!=
255
)
zsk_algorithms
[
dnskey
.
algorithm
]
++
;
goodzsk
=
ISC_TRUE
;
}
else
{
if
(
standby_zsk
[
dnskey
.
algorithm
]
!=
255
)
standby_zsk
[
dnskey
.
algorithm
]
++
;
...
...
@@ -2268,6 +2260,7 @@ addnsec3param(const unsigned char *salt, size_t salt_length,
result
=
dns_rdata_fromstruct
(
&
rdata
,
gclass
,
dns_rdatatype_nsec3param
,
&
nsec3param
,
&
b
);
check_result
(
result
,
"dns_rdata_fromstruct()"
);
rdatalist
.
rdclass
=
rdata
.
rdclass
;
rdatalist
.
type
=
rdata
.
type
;
rdatalist
.
covers
=
0
;
...
...
@@ -2877,7 +2870,7 @@ loadzonekeys(isc_boolean_t preserve_keys, isc_boolean_t load_public) {
}
keyttl
=
rdataset
.
ttl
;
/* Load keys corresponding to the existing DNSKEY RRset */
/* Load keys corresponding to the existing DNSKEY RRset
.
*/
result
=
dns_dnssec_keylistfromrdataset
(
gorigin
,
directory
,
mctx
,
&
rdataset
,
&
keysigs
,
&
soasigs
,
preserve_keys
,
load_public
,
...
...
bin/named/controlconf.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: controlconf.c,v 1.6
0
20
08/07/23 23:27:54
marka Exp $ */
/* $Id: controlconf.c,v 1.6
1
20
11/03/11 06:11:21
marka Exp $ */
/*! \file */
...
...
@@ -859,7 +859,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
cfg_obj_log
(
key
,
ns_g_lctx
,
ISC_LOG_WARNING
,
"secret for key '%s' on command channel: %s"
,
keyid
->
keyname
,
isc_result_totext
(
result
));
CHECK
(
result
)
;
goto
cleanup
;
}
keyid
->
secret
.
length
=
isc_buffer_usedlength
(
&
b
);
...
...
bin/named/interfacemgr.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: interfacemgr.c,v 1.9
5
20
09/01/17 23:47:42 tbox
Exp $ */
/* $Id: interfacemgr.c,v 1.9
6
20
11/03/11 06:11:21 marka
Exp $ */
/*! \file */
...
...
@@ -379,7 +379,7 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
}
}
*
ifpret
=
ifp
;
return
(
ISC_R_SUCCESS
);
return
(
result
);
cleanup_interface:
ISC_LIST_UNLINK
(
ifp
->
mgr
->
interfaces
,
ifp
,
link
);
...
...
@@ -964,7 +964,6 @@ isc_boolean_t
ns_interfacemgr_listeningon
(
ns_interfacemgr_t
*
mgr
,
isc_sockaddr_t
*
addr
)
{
isc_sockaddr_t
*
old
;
old
=
ISC_LIST_HEAD
(
mgr
->
listenon
);
for
(
old
=
ISC_LIST_HEAD
(
mgr
->
listenon
);
old
!=
NULL
;
old
=
ISC_LIST_NEXT
(
old
,
link
))
...
...
bin/named/main.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.18
2
2011/03/1
0 23:47:49 tbox
Exp $ */
/* $Id: main.c,v 1.18
3
2011/03/1
1 06:11:21 marka
Exp $ */
/*! \file */
...
...
@@ -562,6 +562,7 @@ parse_command_line(int argc, char *argv[]) {
argc
-=
isc_commandline_index
;
argv
+=
isc_commandline_index
;
POST
(
argv
);
if
(
argc
>
0
)
{
usage
();
...
...
bin/named/query.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.35
8
2011/03/1
0
0
4:36:14 each
Exp $ */
/* $Id: query.c,v 1.35
9
2011/03/1
1
0
6:11:21 marka
Exp $ */
/*! \file */
...
...
@@ -1622,6 +1622,7 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
need_addname
=
ISC_FALSE
;
zone
=
NULL
;
needadditionalcache
=
ISC_FALSE
;
POST
(
needadditionalcache
);
additionaltype
=
dns_rdatasetadditional_fromauth
;
dns_name_init
(
&
cfname
,
NULL
);
...
...
@@ -4283,11 +4284,12 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
* Check rules for the name if this it the first time,
* i.e. we've not been recursing.
*/
result
=
DNS_R_SERVFAIL
;
st
->
state
&=
~
(
DNS_RPZ_HAVE_IP
|
DNS_RPZ_HAVE_NSIPv4
|
DNS_RPZ_HAVE_NSIPv6
|
DNS_RPZ_HAD_NSDNAME
);
result
=
rpz_rewrite_name
(
client
,
qtype
,
client
->
query
.
qname
,
DNS_RPZ_TYPE_QNAME
,
&
rdataset
);
if
(
result
!=
ISC_R_SUCCESS
)
goto
cleanup
;
if
(
st
->
m
.
policy
!=
DNS_RPZ_POLICY_MISS
)
goto
cleanup
;
if
((
st
->
state
&
(
DNS_RPZ_HAVE_NSIPv4
|
DNS_RPZ_HAVE_NSIPv6
|
...
...
@@ -4393,9 +4395,10 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
(
st
->
state
&
DNS_RPZ_HAVE_NSIPv6
)
!=
0
&&
st
->
m
.
type
!=
DNS_RPZ_TYPE_NSDNAME
)
{
result
=
rpz_rewrite_nsip
(
client
,
dns_rdatatype_aaaa
,
&
ns
.
name
,
&
ipdb
,
version
,
&
rdataset
,
resuming
);
dns_rdatatype_aaaa
,
&
ns
.
name
,
&
ipdb
,
version
,
&
rdataset
,
resuming
);
}
dns_rdata_freestruct
(
&
ns
);
if
(
ipdb
!=
NULL
)
...
...
@@ -4910,12 +4913,14 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset,
break
;
}
}
if
(
i
==
count
)
if
(
i
==
count
&&
aaaaok
!=
NULL
)
isc_mem_put
(
client
->
mctx
,
aaaaok
,
sizeof
(
isc_boolean_t
)
*
count
);
return
(
ISC_TRUE
);
}
isc_mem_put
(
client
->
mctx
,
aaaaok
,
sizeof
(
isc_boolean_t
)
*
count
);
if
(
aaaaok
!=
NULL
)
isc_mem_put
(
client
->
mctx
,
aaaaok
,
sizeof
(
isc_boolean_t
)
*
count
);
return
(
ISC_FALSE
);
}
...
...
@@ -5364,7 +5369,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_name_copy
(
fname
,
rpz_st
->
fname
,
NULL
);
rpz_st
->
q
.
result
=
result
;
client
->
query
.
attributes
|=
NS_QUERYATTR_RECURSING
;
result
=
ISC_R_SUCCESS
;
goto
cleanup
;
default:
RECURSE_ERROR
(
rresult
);
...
...
@@ -5816,8 +5820,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
goto
db_find
;
}
result
=
DNS_R_NXRRSET
;
/*
* Look for a NSEC3 record if we don't have a NSEC record.
*/
...
...
@@ -5932,10 +5934,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
case
DNS_R_NXDOMAIN
:
INSIST
(
is_zone
);
if
(
!
empty_wild
&&
redirect
(
client
,
fname
,
rdataset
,
&
node
,
&
db
,
type
))
{
result
=
ISC_R_SUCCESS
;
redirect
(
client
,
fname
,
rdataset
,
&
node
,
&
db
,
type
))
break
;
}
if
(
dns_rdataset_isassociated
(
rdataset
))
{
/*
* If we've got a NSEC record, we need to save the
...
...
@@ -5994,10 +5994,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
goto
cleanup
;
case
DNS_R_NCACHENXDOMAIN
:
if
(
redirect
(
client
,
fname
,
rdataset
,
&
node
,
&
db
,
type
))
{
result
=
ISC_R_SUCCESS
;
if
(
redirect
(
client
,
fname
,
rdataset
,
&
node
,
&
db
,
type
))
break
;
}
case
DNS_R_NCACHENXRRSET
:
ncache_nxrrset:
INSIST
(
!
is_zone
);
...
...
@@ -6722,9 +6720,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
/*
* Add a fake SOA record.
*/
result
=
query_addsoa
(
client
,
db
,
version
,
600
,
ISC_FALSE
);
(
void
)
query_addsoa
(
client
,
db
,
version
,
600
,
ISC_FALSE
);
goto
cleanup
;
}
#endif
...
...
bin/named/server.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.60
7
2011/03/1
0
0
4:36:14 each
Exp $ */
/* $Id: server.c,v 1.60
8
2011/03/1
1
0
6:11:21 marka
Exp $ */
/*! \file */
...
...
@@ -845,18 +845,13 @@ get_view_querysource_dispatch(const cfg_obj_t **maps,
int
af
,
dns_dispatch_t
**
dispatchp
,
isc_boolean_t
is_firstview
)
{
isc_result_t
result
;
isc_result_t
result
=
ISC_R_FAILURE
;
dns_dispatch_t
*
disp
;
isc_sockaddr_t
sa
;
unsigned
int
attrs
,
attrmask
;
const
cfg_obj_t
*
obj
=
NULL
;
unsigned
int
maxdispatchbuffers
;
/*
* Make compiler happy.
*/
result
=
ISC_R_FAILURE
;
switch
(
af
)
{
case
AF_INET
:
result
=
ns_config_get
(
maps
,
"query-source"
,
&
obj
);
...
...
@@ -1643,6 +1638,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
sep
=
""
;
viewname
=
""
;
forview
=
""
;
POST
(
forview
);
}
/*
...
...
@@ -3184,6 +3180,7 @@ create_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist,
classobj
=
cfg_tuple_get
(
vconfig
,
"class"
);
result
=
ns_config_getclass
(
classobj
,
dns_rdataclass_in
,
&
viewclass
);
INSIST
(
result
==
ISC_R_SUCCESS
);
}
else
{
viewname
=
"_default"
;
viewclass
=
dns_rdataclass_in
;
...
...
@@ -4283,7 +4280,7 @@ load_configuration(const char *filename, ns_server_t *server,
if
(
result
==
ISC_R_SUCCESS
)
maps
[
i
++
]
=
options
;
maps
[
i
++
]
=
ns_g_defaults
;
maps
[
i
++
]
=
NULL
;
maps
[
i
]
=
NULL
;
/*
* If bind.keys exists, load it. If "dnssec-lookaside auto"
...
...
@@ -4509,11 +4506,10 @@ load_configuration(const char *filename, ns_server_t *server,
if
(
options
!=
NULL
)
(
void
)
cfg_map_get
(
options
,
"listen-on"
,
&
clistenon
);
if
(
clistenon
!=
NULL
)
{
result
=
ns_listenlist_fromconfig
(
clistenon
,
config
,
&
aclconfctx
,
ns_g_mctx
,
&
listenon
);
/* check return code? */
(
void
)
ns_listenlist_fromconfig
(
clistenon
,
config
,
&
aclconfctx
,
ns_g_mctx
,
&
listenon
);
}
else
if
(
!
ns_g_lwresdonly
)
{
/*
* Not specified, use default.
...
...
@@ -4537,11 +4533,10 @@ load_configuration(const char *filename, ns_server_t *server,
if
(
options
!=
NULL
)
(
void
)
cfg_map_get
(
options
,
"listen-on-v6"
,
&
clistenon
);
if
(
clistenon
!=
NULL
)
{
result
=
ns_listenlist_fromconfig
(
clistenon
,
config
,
&
aclconfctx
,
ns_g_mctx
,
&
listenon
);
/* check return code? */
(
void
)
ns_listenlist_fromconfig
(
clistenon
,
config
,
&
aclconfctx
,
ns_g_mctx
,
&
listenon
);
}
else
if
(
!
ns_g_lwresdonly
)
{
isc_boolean_t
enable
;
/*
...
...
@@ -5237,8 +5232,8 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {
void
ns_server_create
(
isc_mem_t
*
mctx
,
ns_server_t
**
serverp
)
{
isc_result_t
result
;
ns_server_t
*
server
=
isc_mem_get
(
mctx
,
sizeof
(
*
server
));
if
(
server
==
NULL
)
fatal
(
"allocating server object"
,
ISC_R_NOMEMORY
);
...
...
@@ -5984,7 +5979,6 @@ ns_server_dumpstats(ns_server_t *server) {
"could not open statistics dump file"
,
server
->
statsfile
);
result
=
ns_stats_dump
(
server
,
fp
);
CHECK
(
result
);
cleanup:
if
(
fp
!=
NULL
)
...
...
@@ -6172,6 +6166,7 @@ dumpdone(void *arg, isc_result_t result) {
fprintf
(
dctx
->
fp
,
"; %s
\n
"
,
dns_result_totext
(
result
));
result
=
ISC_R_SUCCESS
;
POST
(
result
);
goto
nextzone
;
}
if
(
result
!=
ISC_R_SUCCESS
)
...
...
bin/named/statschannel.c
View file @
0874abad
...
...
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: statschannel.c,v 1.2
6
201
0
/0
2/04 23:49:13 tbox
Exp $ */
/* $Id: statschannel.c,v 1.2
7
201
1
/0
3/11 06:11:21 marka
Exp $ */
/*! \file */
...
...
@@ -638,7 +638,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) {
static
void
opcodestat_dump
(
dns_opcode_t
code
,
isc_uint64_t
val
,
void
*
arg
)
{
FILE
*
fp
=
arg
;
FILE
*
fp
;
isc_buffer_t
b
;
char
codebuf
[
64
];
stats_dumparg_t
*
dumparg
=
arg
;
...
...
bin/named/update.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: update.c,v 1.1
8
9 2011/0
2
/1
5 18:20:43 fdupont
Exp $ */
/* $Id: update.c,v 1.19
0
2011/0
3
/1
1 06:11:21 marka
Exp $ */
#include <config.h>
...
...
@@ -3734,7 +3734,6 @@ update_action(isc_task_t *task, isc_event_t *event) {
* Check Requestor's Permissions. It seems a bit silly to do this
* only after prerequisite testing, but that is what RFC2136 says.
*/
result
=
ISC_R_SUCCESS
;
if
(
ssutable
==
NULL
)
CHECK
(
checkupdateacl
(
client
,
dns_zone_getupdateacl
(
zone
),
"update"
,
zonename
,
ISC_FALSE
,
ISC_FALSE
));
...
...
bin/named/zoneconf.c
View file @
0874abad
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.17
3
2011/03/11 0
0:43:53
marka Exp $ */
/* $Id: zoneconf.c,v 1.17
4
2011/03/11 0
6:11:21
marka Exp $ */
/*% */
...
...
@@ -127,7 +127,7 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
/* First check to see if ACL is defined within the zone */
if
(
zconfig
!=
NULL
)
{
maps
[
0
]
=
cfg_tuple_get
(
zconfig
,
"options"
);
ns_config_get
(
maps
,
aclname
,
&
aclobj
);
(
void
)
ns_config_get
(
maps
,
aclname
,
&
aclobj
);
if
(
aclobj
!=
NULL
)
{
aclp
=
NULL
;
goto
parse_acl
;
...
...
@@ -155,7 +155,7 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
maps
[
i
++
]
=
ns_g_defaults
;
maps
[
i
]
=
NULL
;
result
=
ns_config_get
(
maps
,
aclname
,
&
aclobj
);
(
void
)
ns_config_get
(
maps
,
aclname
,
&
aclobj
);
if
(
aclobj
==
NULL
)
{
(
*
clearzacl
)(
zone
);
return
(
ISC_R_SUCCESS
);
...
...
@@ -605,7 +605,8 @@ configure_staticstub(const cfg_obj_t *zconfig, dns_zone_t *zone,
/* Prepare zone RRs from the configuration */
obj
=
NULL
;
result
=
cfg_map_get
(
zconfig
,
"server-addresses"
,
&
obj
);
if
(
obj
!=
NULL
)
{
if
(
result
==
ISC_R_SUCCESS
)
{
INSIST
(
obj
!=
NULL
);
result
=
configure_staticstub_serveraddrs
(
obj
,
zone
,
&
rdatalist_ns
,
&
rdatalist_a
,
...
...
@@ -616,7 +617,8 @@ configure_staticstub(const cfg_obj_t *zconfig, dns_zone_t *zone,
obj
=
NULL
;
result
=
cfg_map_get
(
zconfig
,
"server-names"
,
&
obj
);
if
(
obj
!=
NULL
)
{
if
(
result
==
ISC_R_SUCCESS
)
{
INSIST
(
obj
!=
NULL
);
result
=
configure_staticstub_servernames
(
obj
,
zone
,
&
rdatalist_ns
,
zname
);
...
...
@@ -714,7 +716,7 @@ zonetype_fromconfig(const cfg_obj_t *map) {
isc_result_t
result
;