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
Sebastian Schrader
Kea
Commits
7f00956d
Commit
7f00956d
authored
Aug 22, 2012
by
Mukund Sivaraman
Browse files
[2165] Don't strip RRSIGs from DNSSEC rrsets
parent
9a13449f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/lib/datasrc/database.cc
View file @
7f00956d
...
...
@@ -638,7 +638,7 @@ DatabaseClient::Finder::findWildcardMatch(
ZoneFinder
::
ResultContext
DatabaseClient
::
Finder
::
logAndCreateResult
(
const
Name
&
name
,
const
string
*
wildname
,
const
RRType
&
type
,
ZoneFinder
::
Result
code
,
ConstRRsetPtr
rrset
,
const
FindOptions
options
,
ZoneFinder
::
Result
code
,
ConstRRsetPtr
rrset
,
const
isc
::
log
::
MessageID
&
log_id
,
FindResultFlags
flags
)
const
{
if
(
rrset
)
{
...
...
@@ -662,7 +662,7 @@ DatabaseClient::Finder::logAndCreateResult(
arg
(
getClass
()).
arg
(
*
wildname
);
}
}
return
(
ResultContext
(
code
,
stripRRsigs
(
rrset
,
options
)
,
flags
));
return
(
ResultContext
(
code
,
rrset
,
flags
));
}
DatabaseClient
::
Finder
::
FindDNSSECContext
::
FindDNSSECContext
(
...
...
@@ -810,7 +810,7 @@ DatabaseClient::Finder::findOnNameResult(const Name& name,
// - when we are looking for glue records (FIND_GLUE_OK), or
// - when the query type is DS (which cancels the delegation)
return
(
logAndCreateResult
(
name
,
wildname
,
type
,
DELEGATION
,
nsi
->
second
,
options
,
stripRRsigs
(
nsi
->
second
,
options
)
,
wild
?
DATASRC_DATABASE_WILDCARD_NS
:
DATASRC_DATABASE_FOUND_DELEGATION_EXACT
,
flags
));
...
...
@@ -827,7 +827,7 @@ DatabaseClient::Finder::findOnNameResult(const Name& name,
", expected 1"
);
}
return
(
logAndCreateResult
(
name
,
wildname
,
type
,
CNAME
,
cni
->
second
,
options
,
stripRRsigs
(
cni
->
second
,
options
)
,
wild
?
DATASRC_DATABASE_WILDCARD_CNAME
:
DATASRC_DATABASE_FOUND_CNAME
,
flags
));
...
...
@@ -885,12 +885,12 @@ DatabaseClient::Finder::findOnNameResult(const Name& name,
// This log message covers both normal and wildcard cases, so we pass
// NULL for 'wildname'.
return
(
logAndCreateResult
(
name
,
NULL
,
type
,
NXRRSET
,
dnssec_rrset
,
options
,
dnssec_rrset
,
DATASRC_DATABASE_FOUND_NXRRSET_NSEC
,
flags
|
RESULT_NSEC_SIGNED
));
}
return
(
logAndCreateResult
(
name
,
wildname
,
type
,
NXRRSET
,
dnssec_rrset
,
options
,
dnssec_rrset
,
wild
?
DATASRC_DATABASE_WILDCARD_NXRRSET
:
DATASRC_DATABASE_FOUND_NXRRSET
,
flags
|
dnssec_ctx
.
getResultFlags
()));
...
...
src/lib/datasrc/database.h
View file @
7f00956d
...
...
@@ -1336,7 +1336,6 @@ public:
const
isc
::
dns
::
RRType
&
type
,
ZoneFinder
::
Result
code
,
isc
::
dns
::
ConstRRsetPtr
rrset
,
const
FindOptions
options
,
const
isc
::
log
::
MessageID
&
log_id
,
FindResultFlags
flags
)
const
;
...
...
Write
Preview
Supports
Markdown
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