Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
641
Issues
641
List
Boards
Labels
Service Desk
Milestones
Merge Requests
106
Merge Requests
106
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
BIND
Commits
fcb54ce0
Commit
fcb54ce0
authored
Oct 17, 2003
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
whitespace / layout
parent
bb030ee8
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
115 additions
and
122 deletions
+115
-122
bin/check/Makefile.in
bin/check/Makefile.in
+4
-3
bin/check/named-checkzone.c
bin/check/named-checkzone.c
+2
-2
bin/rndc/rndc-confgen.c
bin/rndc/rndc-confgen.c
+2
-2
doc/rfc/index
doc/rfc/index
+1
-0
lib/dns/adb.c
lib/dns/adb.c
+7
-5
lib/dns/include/dns/adb.h
lib/dns/include/dns/adb.h
+2
-2
lib/dns/include/dns/byaddr.h
lib/dns/include/dns/byaddr.h
+2
-2
lib/dns/include/dns/rdata.h
lib/dns/include/dns/rdata.h
+2
-2
lib/dns/masterdump.c
lib/dns/masterdump.c
+16
-16
lib/dns/name.c
lib/dns/name.c
+2
-2
lib/dns/rdata.c
lib/dns/rdata.c
+3
-3
lib/dns/resolver.c
lib/dns/resolver.c
+7
-19
lib/dns/result.c
lib/dns/result.c
+2
-2
lib/dns/zone.c
lib/dns/zone.c
+54
-55
lib/isc/Makefile.in
lib/isc/Makefile.in
+2
-2
lib/isc/win32/time.c
lib/isc/win32/time.c
+3
-3
make/rules.in
make/rules.in
+2
-1
util/merge_copyrights
util/merge_copyrights
+2
-1
No files found.
bin/check/Makefile.in
View file @
fcb54ce0
...
...
@@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.2
1 2002/12/27 03:29:29
marka Exp $
# $Id: Makefile.in,v 1.2
2 2003/10/17 03:46:41
marka Exp $
srcdir
=
@srcdir@
VPATH
=
@srcdir@
...
...
@@ -65,9 +65,10 @@ named-checkzone.@O@: named-checkzone.c
${LIBTOOL}
${CC}
${ALL_CFLAGS}
-DVERSION
=
\"
${VERSION}
\"
\
-c
${srcdir}
/named-checkzone.c
named-checkconf@EXEEXT@
:
named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
named-checkconf@EXEEXT@
:
named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS}
\
${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
${LIBTOOL}
${PURIFY}
${CC}
${CFLAGS}
-o
$@
named-checkconf.@O@
\
check-tool.@O@
${BIND9LIBS}
${
DNSLIBS}
${ISCCFG
LIBS}
${ISCLIBS}
${LIBS}
check-tool.@O@
${BIND9LIBS}
${
ISCCFGLIBS}
${DNS
LIBS}
${ISCLIBS}
${LIBS}
named-checkzone@EXEEXT@
:
named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL}
${PURIFY}
${CC}
${CFLAGS}
-o
$@
named-checkzone.@O@
\
...
...
bin/check/named-checkzone.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkzone.c,v 1.2
5 2002/10/25 01:02:53
marka Exp $ */
/* $Id: named-checkzone.c,v 1.2
6 2003/10/17 03:46:41
marka Exp $ */
#include <config.h>
...
...
@@ -112,7 +112,7 @@ main(int argc, char **argv) {
quiet
++
;
break
;
case
't'
:
case
't'
:
result
=
isc_dir_chroot
(
isc_commandline_argument
);
if
(
result
!=
ISC_R_SUCCESS
)
{
fprintf
(
stderr
,
"isc_dir_chroot: %s: %s
\n
"
,
...
...
bin/rndc/rndc-confgen.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rndc-confgen.c,v 1.1
6 2003/03/03 05:08:56
marka Exp $ */
/* $Id: rndc-confgen.c,v 1.1
7 2003/10/17 03:46:42
marka Exp $ */
#include <config.h>
...
...
@@ -101,7 +101,7 @@ write_key_file(const char *keyfile, const char *user,
(
int
)
isc_buffer_usedlength
(
secret
),
(
char
*
)
isc_buffer_base
(
secret
));
fflush
(
fd
);
if
(
ferror
(
fd
))
if
(
ferror
(
fd
))
fatal
(
"write to %s failed
\n
"
,
keyfile
);
if
(
fclose
(
fd
))
fatal
(
"fclose(%s) failed
\n
"
,
keyfile
);
...
...
doc/rfc/index
View file @
fcb54ce0
...
...
@@ -66,6 +66,7 @@
3090: DNS Security Extension Clarification on Zone Status
3110: RSA/SHA-1 SIGs and RSA KEYs in the Domain Name System (DNS)
3123: A DNS RR Type for Lists of Address Prefixes (APL RR)
3152: Delegation of IP6.ARPA
3225: Indicating Resolver Support of DNSSEC
3226: DNSSEC and IPv6 A6 aware server/resolver message size requirements
3258: Distributing Authoritative Name Servers via Shared Unicast Addresses
...
...
lib/dns/adb.c
View file @
fcb54ce0
/*
* Copyright (C) 1999-200
1
Internet Software Consortium.
* Copyright (C) 1999-200
3
Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.c,v 1.2
09 2003/10/16 05:46:19
marka Exp $ */
/* $Id: adb.c,v 1.2
10 2003/10/17 03:46:43
marka Exp $ */
/*
* Implementation notes
...
...
@@ -76,7 +76,7 @@
*
* XXXRTH How many buckets do we need?
*/
#define NBUCKETS
1009
/* how many buckets for names/addrs */
#define NBUCKETS
1009
/* how many buckets for names/addrs */
/*
* For type 3 negative cache entries, we will remember that the address is
...
...
@@ -1844,6 +1844,7 @@ check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now)
if
(
entry
->
expires
==
0
||
(
!
expire
&&
entry
->
expires
>
now
))
return
(
result
);
/*
* The entry is not in use. Delete it.
*/
...
...
@@ -2505,7 +2506,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
dns_rdatatype_aaaa
)
==
ISC_R_SUCCESS
)
{
DP
(
DEF_LEVEL
,
"dns_adb_createfind: "
"started AAAA fetch for name %p"
,
"started AAAA fetch for name %p"
,
adbname
);
}
}
...
...
@@ -3266,7 +3267,8 @@ fetch_name(dns_adbname_t *adbname,
options
=
0
;
if
(
start_at_zone
)
{
DP
(
50
,
"fetch_name: starting at zone for %p"
,
DP
(
ENTER_LEVEL
,
"fetch_name: starting at zone for name %p"
,
adbname
);
dns_fixedname_init
(
&
fixed
);
name
=
dns_fixedname_name
(
&
fixed
);
...
...
lib/dns/include/dns/adb.h
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.h,v 1.7
4 2003/07/25 02:22:2
5 marka Exp $ */
/* $Id: adb.h,v 1.7
5 2003/10/17 03:46:4
5 marka Exp $ */
#ifndef DNS_ADB_H
#define DNS_ADB_H 1
...
...
@@ -253,7 +253,7 @@ dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbp);
* Requires:
* 'adb' to be a valid dns_adb_t, created via dns_adb_create().
* 'adbp' to be a valid pointer to a *dns_adb_t which is initialized
*
to NULL.
* to NULL.
*/
void
...
...
lib/dns/include/dns/byaddr.h
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: byaddr.h,v 1.1
4 2002/08/27 04:53:43
marka Exp $ */
/* $Id: byaddr.h,v 1.1
5 2003/10/17 03:46:45
marka Exp $ */
#ifndef DNS_BYADDR_H
#define DNS_BYADDR_H 1
...
...
@@ -150,7 +150,7 @@ dns_byaddr_createptrname(isc_netaddr_t *address, isc_boolean_t nibble,
isc_result_t
dns_byaddr_createptrname2
(
isc_netaddr_t
*
address
,
unsigned
int
options
,
dns_name_t
*
name
);
dns_name_t
*
name
);
/*
* Creates a name that would be used in a PTR query for this address. The
* nibble flag indicates that the 'nibble' format is to be used if an IPv6
...
...
lib/dns/include/dns/rdata.h
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdata.h,v 1.5
7 2003/09/30 05:56:17
marka Exp $ */
/* $Id: rdata.h,v 1.5
8 2003/10/17 03:46:45
marka Exp $ */
#ifndef DNS_RDATA_H
#define DNS_RDATA_H 1
...
...
@@ -161,7 +161,7 @@ dns_rdata_reset(dns_rdata_t *rdata);
* Make 'rdata' empty.
*
* Requires:
* 'rdata' is a previously init
alias
ed rdata and is not linked.
* 'rdata' is a previously init
ializ
ed rdata and is not linked.
*/
void
...
...
lib/dns/masterdump.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.
69 2003/09/30 05:56:12
marka Exp $ */
/* $Id: masterdump.c,v 1.
70 2003/10/17 03:46:43
marka Exp $ */
#include <config.h>
...
...
@@ -894,10 +894,10 @@ void
dns_dumpctx_detach
(
dns_dumpctx_t
**
dctxp
)
{
dns_dumpctx_t
*
dctx
;
isc_boolean_t
need_destroy
=
ISC_FALSE
;
REQUIRE
(
dctxp
!=
NULL
);
dctx
=
*
dctxp
;
REQUIRE
(
DNS_DCTX_VALID
(
dctx
));
REQUIRE
(
DNS_DCTX_VALID
(
dctx
));
*
dctxp
=
NULL
;
...
...
@@ -925,11 +925,11 @@ dns_dumpctx_db(dns_dumpctx_t *dctx) {
void
dns_dumpctx_cancel
(
dns_dumpctx_t
*
dctx
)
{
REQUIRE
(
DNS_DCTX_VALID
(
dctx
));
LOCK
(
&
dctx
->
lock
);
dctx
->
canceled
=
ISC_TRUE
;
UNLOCK
(
&
dctx
->
lock
);
REQUIRE
(
DNS_DCTX_VALID
(
dctx
));
LOCK
(
&
dctx
->
lock
);
dctx
->
canceled
=
ISC_TRUE
;
UNLOCK
(
&
dctx
->
lock
);
}
static
isc_result_t
...
...
@@ -1002,8 +1002,8 @@ static isc_result_t
task_send
(
dns_dumpctx_t
*
dctx
)
{
isc_event_t
*
event
;
event
=
isc_event_allocate
(
dctx
->
mctx
,
NULL
,
DNS_EVENT_
DUMP
QUANTUM
,
dump_quantum
,
dctx
,
sizeof
(
*
event
));
event
=
isc_event_allocate
(
dctx
->
mctx
,
NULL
,
DNS_EVENT_
MASTER
QUANTUM
,
dump_quantum
,
dctx
,
sizeof
(
*
event
));
if
(
event
==
NULL
)
return
(
ISC_R_NOMEMORY
);
isc_task_send
(
dctx
->
task
,
&
event
);
...
...
@@ -1035,7 +1035,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
dctx
->
canceled
=
ISC_FALSE
;
dctx
->
file
=
NULL
;
dctx
->
tmpfile
=
NULL
;
result
=
totext_ctx_init
(
style
,
&
dctx
->
tctx
);
if
(
result
!=
ISC_R_SUCCESS
)
{
UNEXPECTED_ERROR
(
__FILE__
,
__LINE__
,
...
...
@@ -1049,7 +1049,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
dctx
->
do_date
=
dns_db_iscache
(
dctx
->
db
);
relative
=
((
dctx
->
tctx
.
style
.
flags
&
DNS_STYLEFLAG_REL_OWNER
)
!=
0
)
?
ISC_TRUE
:
ISC_FALSE
,
ISC_TRUE
:
ISC_FALSE
;
result
=
dns_db_createiterator
(
dctx
->
db
,
relative
,
&
dctx
->
dbiter
);
if
(
result
!=
ISC_R_SUCCESS
)
goto
cleanup
;
...
...
@@ -1067,7 +1067,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
*
dctxp
=
dctx
;
return
(
ISC_R_SUCCESS
);
cleanup:
cleanup:
if
(
dctx
->
dbiter
!=
NULL
)
dns_dbiterator_destroy
(
&
dctx
->
dbiter
);
if
(
dctx
->
db
!=
NULL
)
...
...
@@ -1115,7 +1115,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
dctx
->
first
=
ISC_FALSE
;
}
else
result
=
ISC_R_SUCCESS
;
nodes
=
dctx
->
nodes
;
while
(
result
==
ISC_R_SUCCESS
&&
(
dctx
->
nodes
==
0
||
nodes
--
))
{
dns_rdatasetiter_t
*
rdsiter
=
NULL
;
...
...
@@ -1155,7 +1155,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
result
=
DNS_R_CONTINUE
;
}
else
if
(
result
==
ISC_R_NOMORE
)
result
=
ISC_R_SUCCESS
;
fail:
fail:
isc_mem_put
(
dctx
->
mctx
,
buffer
.
base
,
buffer
.
length
);
return
(
result
);
}
...
...
@@ -1170,7 +1170,7 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db,
{
dns_dumpctx_t
*
dctx
=
NULL
;
isc_result_t
result
;
REQUIRE
(
task
!=
NULL
);
REQUIRE
(
f
!=
NULL
);
REQUIRE
(
done
!=
NULL
);
...
...
lib/dns/name.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: name.c,v 1.14
0 2003/07/25 02:22:24
marka Exp $ */
/* $Id: name.c,v 1.14
1 2003/10/17 03:46:43
marka Exp $ */
#include <config.h>
...
...
@@ -1250,7 +1250,7 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
}
count
--
;
}
}
else
{
}
else
{
FATAL_ERROR
(
__FILE__
,
__LINE__
,
"Unexpected label type %02x"
,
count
);
/* NOTREACHED */
...
...
lib/dns/rdata.c
View file @
fcb54ce0
/*
* Copyright (C) 1998-200
2
Internet Software Consortium.
* Copyright (C) 1998-200
3
Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdata.c,v 1.18
0 2003/09/30 05:56:12
marka Exp $ */
/* $Id: rdata.c,v 1.18
1 2003/10/17 03:46:43
marka Exp $ */
#include <config.h>
#include <ctype.h>
...
...
@@ -990,7 +990,7 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source,
*/
strncpy
(
buffer
,
source
->
base
,
NUMBERSIZE
);
INSIST
(
buffer
[
source
->
length
]
==
'\0'
);
result
=
isc_parse_uint32
(
&
n
,
buffer
,
10
);
if
(
result
==
ISC_R_BADNUMBER
&&
hex_allowed
)
result
=
isc_parse_uint32
(
&
n
,
buffer
,
16
);
...
...
lib/dns/resolver.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.2
69 2003/09/30 05:56:13
marka Exp $ */
/* $Id: resolver.c,v 1.2
70 2003/10/17 03:46:44
marka Exp $ */
#include <config.h>
...
...
@@ -548,7 +548,7 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
if
(
UNMARKED
(
addrinfo
))
dns_adb_adjustsrtt
(
fctx
->
adb
,
addrinfo
,
0
,
factor
);
for
(
find
=
ISC_LIST_HEAD
(
fctx
->
altfinds
);
for
(
find
=
ISC_LIST_HEAD
(
fctx
->
altfinds
);
find
!=
NULL
;
find
=
ISC_LIST_NEXT
(
find
,
publink
))
for
(
addrinfo
=
ISC_LIST_HEAD
(
find
->
list
);
...
...
@@ -1737,8 +1737,7 @@ findname(fetchctx_t *fctx, dns_name_t *name, in_port_t port,
* And ADB isn't going to send us any events
* either. This find loses.
*/
if
((
find
->
options
&
DNS_ADBFIND_LAMEPRUNED
)
!=
0
)
{
if
((
find
->
options
&
DNS_ADBFIND_LAMEPRUNED
)
!=
0
)
{
/*
* The ADB pruned lame servers for
* this name. Remember that in case
...
...
@@ -1803,7 +1802,7 @@ fctx_getaddresses(fetchctx_t *fctx) {
fctx
->
fwdpolicy
=
forwarders
->
fwdpolicy
;
}
}
while
(
sa
!=
NULL
)
{
ai
=
NULL
;
result
=
dns_adb_findaddrinfo
(
fctx
->
adb
,
...
...
@@ -2147,7 +2146,7 @@ fctx_nextaddress(fetchctx_t *fctx) {
if
(
!
UNMARKED
(
addrinfo
))
continue
;
possibly_mark
(
fctx
,
addrinfo
);
if
(
UNMARKED
(
addrinfo
)
&&
if
(
UNMARKED
(
addrinfo
)
&&
(
faddrinfo
==
NULL
||
addrinfo
->
srtt
<
faddrinfo
->
srtt
))
{
if
(
faddrinfo
!=
NULL
)
...
...
@@ -4995,11 +4994,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
/*
* Enforce delegations only zones like NET and COM.
*/
oldcounts
[
DNS_SECTION_QUESTION
]
=
message
->
counts
[
DNS_SECTION_QUESTION
];
oldcounts
[
DNS_SECTION_ANSWER
]
=
message
->
counts
[
DNS_SECTION_ANSWER
];
oldcounts
[
DNS_SECTION_AUTHORITY
]
=
message
->
counts
[
DNS_SECTION_AUTHORITY
];
oldcounts
[
DNS_SECTION_ADDITIONAL
]
=
message
->
counts
[
DNS_SECTION_ADDITIONAL
];
if
(
!
ISFORWARDER
(
query
->
addrinfo
)
&&
dns_view_isdelegationonly
(
fctx
->
res
->
view
,
&
fctx
->
domain
)
&&
!
dns_name_equal
(
&
fctx
->
domain
,
&
fctx
->
name
)
&&
...
...
@@ -5021,14 +5015,8 @@ oldcounts[DNS_SECTION_ADDITIONAL] = message->counts[DNS_SECTION_ADDITIONAL];
isc_log_write
(
dns_lctx
,
DNS_LOGCATEGORY_DELEGATION_ONLY
,
DNS_LOGMODULE_RESOLVER
,
ISC_LOG_NOTICE
,
"enforced delegation-only for '%s' (%s/%s/%s) "
"flags=%04x counts(%u,%u,%u,%u) from %s"
,
domainbuf
,
namebuf
,
typebuf
,
classbuf
,
message
->
flags
,
oldcounts
[
DNS_SECTION_QUESTION
],
oldcounts
[
DNS_SECTION_ANSWER
],
oldcounts
[
DNS_SECTION_AUTHORITY
],
oldcounts
[
DNS_SECTION_ADDITIONAL
],
addrbuf
);
"from %s"
,
domainbuf
,
namebuf
,
typebuf
,
classbuf
,
addrbuf
);
}
/*
...
...
lib/dns/result.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: result.c,v 1.1
09 2003/09/30 05:56:13
marka Exp $ */
/* $Id: result.c,v 1.1
10 2003/10/17 03:46:44
marka Exp $ */
#include <config.h>
...
...
@@ -131,7 +131,7 @@ static const char *text[DNS_R_NRESULTS] = {
"unknown flag"
,
/* 82 DNS_R_UNKNOWNFLAG */
"expected a response"
,
/* 83 DNS_R_EXPECTEDRESPONSE */
"no valid DS"
,
/* 84 DNS_R_NOVALIDDS */
"NS is an address"
,
/* 85 DNS_R_NSISADDRESS */
"received FORMERR"
,
/* 86 DNS_R_REMOTEFORMERR */
"truncated TCP response"
,
/* 87 DNS_R_TRUNCATEDTCP */
...
...
lib/dns/zone.c
View file @
fcb54ce0
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.
399 2003/09/25 18:16:47 jinmei
Exp $ */
/* $Id: zone.c,v 1.
400 2003/10/17 03:46:44 marka
Exp $ */
#include <config.h>
...
...
@@ -139,7 +139,7 @@ struct dns_zone {
isc_timer_t
*
timer
;
unsigned
int
irefs
;
dns_name_t
origin
;
char
*
masterfile
;
char
*
masterfile
;
char
*
journal
;
isc_int32_t
journalsize
;
dns_rdataclass_t
rdclass
;
...
...
@@ -271,7 +271,7 @@ struct dns_zone {
struct
dns_zonemgr
{
unsigned
int
magic
;
isc_mem_t
*
mctx
;
int
refs
;
/* Locked by rwlock */
int
refs
;
/* Locked by rwlock */
isc_taskmgr_t
*
taskmgr
;
isc_timermgr_t
*
timermgr
;
isc_socketmgr_t
*
socketmgr
;
...
...
@@ -353,7 +353,7 @@ struct dns_forward {
isc_uint32_t
which
;
isc_sockaddr_t
addr
;
dns_updatecallback_t
callback
;
void
*
callback_arg
;
void
*
callback_arg
;
};
/*
...
...
@@ -580,7 +580,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
result
=
dns_zone_setdbtype
(
zone
,
dbargc_default
,
dbargv_default
);
if
(
result
!=
ISC_R_SUCCESS
)
goto
free_mutex
;
ISC_EVENT_INIT
(
&
zone
->
ctlevent
,
sizeof
(
zone
->
ctlevent
),
0
,
NULL
,
DNS_EVENT_ZONECONTROL
,
zone_shutdown
,
zone
,
zone
,
NULL
,
NULL
);
...
...
@@ -765,18 +765,18 @@ dns_zone_setdbtype(dns_zone_t *zone,
zone
->
db_argv
=
new
;
result
=
ISC_R_SUCCESS
;
goto
unlock
;
nomem:
if
(
new
!=
NULL
)
{
for
(
i
=
0
;
i
<
dbargc
;
i
++
)
{
if
(
zone
->
db_argv
[
i
]
!=
NULL
)
isc_mem_free
(
zone
->
mctx
,
new
[
i
]);
isc_mem_put
(
zone
->
mctx
,
new
,
isc_mem_put
(
zone
->
mctx
,
new
,
dbargc
*
sizeof
(
*
new
));
}
}
result
=
ISC_R_NOMEMORY
;
unlock:
UNLOCK_ZONE
(
zone
);
return
(
result
);
...
...
@@ -819,7 +819,7 @@ dns_zone_setorigin(dns_zone_t *zone, dns_name_t *origin) {
return
(
result
);
}
static
isc_result_t
dns_zone_setstring
(
dns_zone_t
*
zone
,
char
**
field
,
const
char
*
value
)
{
char
*
copy
;
...
...
@@ -837,7 +837,7 @@ dns_zone_setstring(dns_zone_t *zone, char **field, const char *value) {
*
field
=
copy
;
return
(
ISC_R_SUCCESS
);
}
}
isc_result_t
dns_zone_setfile
(
dns_zone_t
*
zone
,
const
char
*
file
)
{
...
...
@@ -893,7 +893,7 @@ dns_zone_setjournal(dns_zone_t *zone, const char *journal) {
REQUIRE
(
DNS_ZONE_VALID
(
zone
));
LOCK_ZONE
(
zone
);
result
=
dns_zone_setstring
(
zone
,
&
zone
->
journal
,
journal
);
result
=
dns_zone_setstring
(
zone
,
&
zone
->
journal
,
journal
);
UNLOCK_ZONE
(
zone
);
return
(
result
);
...
...
@@ -923,7 +923,7 @@ zone_isdynamic(dns_zone_t *zone) {
zone
->
type
==
dns_zone_stub
||
(
!
zone
->
update_disabled
&&
zone
->
ssutable
!=
NULL
)
||
(
!
zone
->
update_disabled
&&
zone
->
update_acl
!=
NULL
&&
!
(
zone
->
update_acl
->
length
==
1
&&
!
(
zone
->
update_acl
->
length
==
1
&&
zone
->
update_acl
->
elements
[
0
].
negative
==
ISC_TRUE
&&
zone
->
update_acl
->
elements
[
0
].
type
==
...
...
@@ -972,7 +972,7 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
result
=
ISC_R_SUCCESS
;
goto
cleanup
;
}
/*
* Don't do the load if the file that stores the zone is older
* than the last time the zone was loaded. If the zone has not
...
...
@@ -999,7 +999,7 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
goto
cleanup
;
}
}
}
}
INSIST
(
zone
->
db_argc
>=
1
);
...
...
@@ -1190,7 +1190,7 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
&
load
->
callbacks
.
add_private
);
if
(
result
!=
ISC_R_SUCCESS
)
goto
cleanup
;
result
=
zonemgr_getio
(
zone
->
zmgr
,
ISC_TRUE
,
zone
->
task
,
result
=
zonemgr_getio
(
zone
->
zmgr
,
ISC_TRUE
,
zone
->
task
,
zone_gotreadhandle
,
load
,
&
zone
->
readio
);
if
(
result
!=
ISC_R_SUCCESS
)
{
...
...
@@ -1890,7 +1890,7 @@ dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *notify,
memcpy
(
new
,
notify
,
count
*
sizeof
(
*
new
));
zone
->
notify
=
new
;
zone
->
notifycnt
=
count
;
}
}
UNLOCK_ZONE
(
zone
);
return
(
ISC_R_SUCCESS
);
}
...
...
@@ -2045,7 +2045,7 @@ dns_zone_maintenance(dns_zone_t *zone) {
static
inline
isc_boolean_t
was_dumping
(
dns_zone_t
*
zone
)
{
isc_boolean_t
dumping
;
REQUIRE
(
LOCKED_ZONE
(
zone
));
dumping
=
DNS_ZONE_FLAG
(
zone
,
DNS_ZONEFLG_DUMPING
);
...
...
@@ -2229,7 +2229,7 @@ dns_zone_refresh(dns_zone_t *zone) {
/*
* When lacking user-specified timer values from the SOA,
* do exponential backoff of the retry time up to a
* do exponential backoff of the retry time up to a
* maximum of six hours.
*/
if
(
!
DNS_ZONE_FLAG
(
zone
,
DNS_ZONEFLG_HAVETIMERS
))
...
...
@@ -2370,7 +2370,7 @@ dump_done(void *arg, isc_result_t result) {
again
=
ISC_TRUE
;
}
else
if
(
result
==
ISC_R_SUCCESS
)
DNS_ZONE_CLRFLAG
(
zone
,
DNS_ZONEFLG_FLUSH
);
if
(
zone
->
dctx
!=
NULL
)
dns_dumpctx_detach
(
&
zone
->
dctx
);
UNLOCK_ZONE
(
zone
);
...
...
@@ -2412,12 +2412,11 @@ zone_dump(dns_zone_t *zone, isc_boolean_t compact) {
goto
fail
;
}
if
(
compact
)
{
dns_zone_t
*
dummy
=
NULL
;
LOCK_ZONE
(
zone
);
zone_iattach
(
zone
,
&
dummy
);
result
=
zonemgr_getio
(
zone
->
zmgr
,
ISC_FALSE
,
zone
->
task
,
result
=
zonemgr_getio
(
zone
->
zmgr
,
ISC_FALSE
,
zone
->
task
,
zone_gotwritehandle
,
zone
,
&
zone
->
writeio
);
if
(
result
!=
ISC_R_SUCCESS
)
...
...
@@ -2425,10 +2424,10 @@ zone_dump(dns_zone_t *zone, isc_boolean_t compact) {
else
result
=
DNS_R_CONTINUE
;
UNLOCK_ZONE
(
zone
);
}
else
{
}
else
{
dns_db_currentversion
(
db
,
&
version
);
result
=
dns_master_dump
(
zone
->
mctx
,
db
,
version
,
&
dns_master_style_default
,
&
dns_master_style_default
,
masterfile
);
dns_db_closeversion
(
db
,
&
version
,
ISC_FALSE
);
}
...
...
@@ -2457,7 +2456,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_t compact) {
DNS_ZONE_SETFLAG
(
zone
,
DNS_ZONEFLG_DUMPING
);
isc_time_settoepoch
(
&
zone
->
dumptime
);
again
=
ISC_TRUE
;
}
else
}
else
DNS_ZONE_CLRFLAG
(
zone
,
DNS_ZONEFLG_FLUSH
);
UNLOCK_ZONE
(
zone
);
if
(
again
)
...
...
@@ -2523,7 +2522,7 @@ zone_unload(dns_zone_t *zone) {
/*
* 'zone' locked by caller.
*/
*/
REQUIRE
(
LOCKED_ZONE
(
zone
));
...
...
@@ -2677,7 +2676,7 @@ notify_find_address(dns_notify_t *notify) {
if
(
notify
->
zone
->
view
->
adb
==
NULL
)
goto
destroy
;
result
=
dns_adb_createfind
(
notify
->
zone
->
view
->
adb
,
notify
->
zone
->
task
,
process_adb_event
,
notify
,
...
...
@@ -2794,7 +2793,7 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
if
(
DNS_ZONE_FLAG
(
notify
->
zone
,
DNS_ZONEFLG_DIALNOTIFY
))
timeout
=
30
;
result
=
dns_request_createvia2
(
notify
->
zone
->
view
->
requestmgr
,
message
,
&
src
,
&
notify
->
dst
,
0
,
key
,
message
,
&
src
,
&
notify
->
dst
,
0
,
key
,
timeout
*
3
,
timeout
,
notify
->
zone
->
task
,
notify_done
,
notify
,
&
notify
->
request
);
...
...
@@ -3931,7 +3930,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
if
(
DNS_ZONE_FLAG
(
zone
,
DNS_ZONEFLG_DIALREFRESH
))
timeout
=
30
;
result
=
dns_request_createvia2
(
zone
->
view
->
requestmgr
,
message
,
&
zone
->
sourceaddr
,
&
zone
->
masteraddr
,
&
zone
->
sourceaddr
,
&
zone
->
masteraddr
,
options
,
key
,
timeout
*
3
,
timeout
,
zone
->
task
,
refresh_callback
,
zone
,
&
zone
->
request
);
...
...
@@ -4008,7 +4007,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
if
(
zone
->
db
!=
NULL
)
dns_db_attach
(
zone
->
db
,
&
stub
->
db
);
else
{
INSIST
(
zone
->
db_argc
>=
1
);
INSIST
(
zone
->
db_argc
>=
1
);
result
=
dns_db_create
(
zone
->
mctx
,
zone
->
db_argv
[
0
],
&
zone
->
origin
,
dns_dbtype_stub
,
zone
->
rdclass
,
...
...
@@ -4019,7 +4018,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
dns_zone_log
(
zone
,
ISC_LOG_ERROR
,