Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
953692fa
Commit
953692fa
authored
Jul 25, 2012
by
Tinderbox User
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update copyright notice
parent
19ad308d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
21 deletions
+21
-21
bin/named/query.c
bin/named/query.c
+3
-3
bin/tests/system/dnssec/ns3/expired.example.db.in
bin/tests/system/dnssec/ns3/expired.example.db.in
+1
-1
bin/tests/system/dnssec/ns3/expiring.example.db.in
bin/tests/system/dnssec/ns3/expiring.example.db.in
+1
-1
bin/tests/system/dnssec/ns4/named3.conf
bin/tests/system/dnssec/ns4/named3.conf
+1
-1
lib/dns/include/dns/rdataset.h
lib/dns/include/dns/rdataset.h
+3
-3
lib/dns/rdataset.c
lib/dns/rdataset.c
+11
-11
lib/dns/tests/rdataset_test.c
lib/dns/tests/rdataset_test.c
+1
-1
No files found.
bin/named/query.c
View file @
953692fa
...
...
@@ -2833,8 +2833,8 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
dns_dbnode_t
*
node
=
NULL
;
dns_clientinfomethods_t
cm
;
dns_clientinfo_t
ci
;
isc_stdtime_t
now
;
isc_stdtime_t
now
;
rdataset
->
trust
=
dns_trust_secure
;
sigrdataset
->
trust
=
dns_trust_secure
;
dns_clientinfomethods_init
(
&
cm
,
ns_client_sourceip
);
...
...
@@ -2846,7 +2846,7 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
result
=
dns_db_findnodeext
(
db
,
name
,
ISC_TRUE
,
&
cm
,
&
ci
,
&
node
);
if
(
result
!=
ISC_R_SUCCESS
)
return
;
isc_stdtime_get
(
&
now
);
dns_rdataset_trimttl
(
rdataset
,
sigrdataset
,
rrsig
,
now
,
client
->
view
->
acceptexpired
);
...
...
bin/tests/system/dnssec/ns3/expired.example.db.in
View file @
953692fa
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2011
, 2012
Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
...
...
bin/tests/system/dnssec/ns3/expiring.example.db.in
View file @
953692fa
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2011
, 2012
Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
...
...
bin/tests/system/dnssec/ns4/named3.conf
View file @
953692fa
/*
*
Copyright
(
C
)
201
1
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
Copyright
(
C
)
201
2
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
...
...
lib/dns/include/dns/rdataset.h
View file @
953692fa
/*
* Copyright (C) 2004-201
1
Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-201
2
Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
...
...
@@ -654,8 +654,8 @@ dns_rdataset_expire(dns_rdataset_t *rdataset);
void
dns_rdataset_trimttl
(
dns_rdataset_t
*
rdataset
,
dns_rdataset_t
*
sigrdataset
,
dns_rdata_rrsig_t
*
rrsig
,
isc_stdtime_t
now
,
isc_boolean_t
acceptexpired
);
dns_rdata_rrsig_t
*
rrsig
,
isc_stdtime_t
now
,
isc_boolean_t
acceptexpired
);
/*%<
* Trim the ttl of 'rdataset' and 'sigrdataset' so that they will expire
* at or before 'rrsig->expiretime'. If 'acceptexpired' is true and the
...
...
lib/dns/rdataset.c
View file @
953692fa
...
...
@@ -788,15 +788,15 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
/*
* If we accept expired RRsets keep them for no more than 120 seconds.
*/
if
(
acceptexpired
&&
(
isc_serial_le
(
rrsig
->
timeexpire
,
((
now
+
120
)
&
0xffffffff
))
||
isc_serial_le
(
rrsig
->
timeexpire
,
now
)))
ttl
=
120
;
else
if
(
isc_serial_ge
(
rrsig
->
timeexpire
,
now
))
ttl
=
rrsig
->
timeexpire
-
now
;
ttl
=
ISC_MIN
(
ISC_MIN
(
rdataset
->
ttl
,
sigrdataset
->
ttl
),
ISC_MIN
(
rrsig
->
originalttl
,
ttl
));
rdataset
->
ttl
=
ttl
;
sigrdataset
->
ttl
=
ttl
;
if
(
acceptexpired
&&
(
isc_serial_le
(
rrsig
->
timeexpire
,
((
now
+
120
)
&
0xffffffff
))
||
isc_serial_le
(
rrsig
->
timeexpire
,
now
)))
ttl
=
120
;
else
if
(
isc_serial_ge
(
rrsig
->
timeexpire
,
now
))
ttl
=
rrsig
->
timeexpire
-
now
;
ttl
=
ISC_MIN
(
ISC_MIN
(
rdataset
->
ttl
,
sigrdataset
->
ttl
),
ISC_MIN
(
rrsig
->
originalttl
,
ttl
));
rdataset
->
ttl
=
ttl
;
sigrdataset
->
ttl
=
ttl
;
}
lib/dns/tests/rdataset_test.c
View file @
953692fa
/*
* Copyright (C)
2011,
2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment