Commit 13685cc4 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

Merge branch 'trac2951'

parents 6d057a28 5bfc7295
......@@ -646,7 +646,7 @@ DatabaseClient::Finder::findWildcardMatch(
// Strip off the left-more label(s) in the name and replace with a "*".
const Name superdomain(name.split(i));
const string wildcard("*." + superdomain.toText());
const string wildcard(Name("*").concatenate(superdomain).toText());
const string construct_name(name.toText());
// TODO Add a check for DNAME, as DNAME wildcards are discouraged (see
......
/bindctl_commands.config
/example.org.config
/root.config
{
"version": 3,
"Logging": {
"loggers": [ {
"debuglevel": 99,
"severity": "DEBUG",
"name": "*"
} ]
},
"Auth": {
"database_file": "data/root.sqlite3",
"listen_on": [ {
"port": 56176,
"address": "127.0.0.1"
} ]
},
"data_sources": {
"classes": {
"IN": [
{
"type": "sqlite3",
"cache-enable": false,
"params": {
"database_file": "data/root.sqlite3"
}
}
]
}
},
"Stats": {
"poll-interval": 60
},
"Init": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
"b10-stats": { "address": "Stats", "kind": "dispensable" },
"b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
}
}
}
/inmem-xfrin.sqlite3
/root.sqlite3
/test_nonexistent_db.sqlite3
/xfrin-before-diffs.sqlite3
/xfrin-notify.sqlite3
......@@ -412,3 +412,21 @@ Feature: Querying feature
| qryauthans | 2 |
| qrynxrrset | 1 |
| rcode.noerror | 2 |
Scenario: Querying non-existing name in root zone from sqlite3 should work
Given I have bind10 running with configuration root.config
And wait for bind10 stderr message BIND10_STARTED_CC
And wait for bind10 stderr message CMDCTL_STARTED
And wait for bind10 stderr message AUTH_SERVER_STARTED
bind10 module Auth should be running
And bind10 module Stats should be running
And bind10 module Resolver should not be running
And bind10 module Xfrout should not be running
And bind10 module Zonemgr should not be running
And bind10 module Xfrin should not be running
And bind10 module StatsHttpd should not be running
A query for . type SOA should have rcode NOERROR
A query for nonexistent. type A should have rcode NXDOMAIN
Then wait for bind10 stderr message AUTH_SEND_NORMAL_RESPONSE not AUTH_PROCESS_FAIL
......@@ -76,8 +76,12 @@ copylist = [
"configurations/xfrin/retransfer_slave.conf"],
["configurations/xfrin/retransfer_slave_notify.conf.orig",
"configurations/xfrin/retransfer_slave_notify.conf"],
["configurations/root.config.orig",
"configurations/root.config"],
["data/inmem-xfrin.sqlite3.orig",
"data/inmem-xfrin.sqlite3"],
["data/root.sqlite3.orig",
"data/root.sqlite3"],
["data/xfrin-before-diffs.sqlite3.orig",
"data/xfrin-before-diffs.sqlite3"],
["data/xfrin-notify.sqlite3.orig",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment