BIND 10 master, updated. 13685cc4580660eaf5b041b683a2d2f31fd24de3 Merge branch 'trac2951'
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jan 28 01:42:32 UTC 2014
The branch, master has been updated
via 13685cc4580660eaf5b041b683a2d2f31fd24de3 (commit)
via 5bfc72950099a121838afff9fd2bf9e1230e5118 (commit)
via 6271645f1897d26c1279512017d8343b655c5c17 (commit)
via b0f04bed614afdcc3353aa4a15dde9610ee1884e (commit)
from 6d057a28a61986da08074f066740be9a39daf404 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 13685cc4580660eaf5b041b683a2d2f31fd24de3
Merge: 6d057a2 5bfc729
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jan 28 06:59:32 2014 +0530
Merge branch 'trac2951'
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/database.cc | 2 +-
tests/lettuce/configurations/.gitignore | 1 +
.../{example.org.config.orig => root.config.orig} | 9 +++++++--
tests/lettuce/data/.gitignore | 1 +
.../lettuce/data/root.sqlite3.orig | Bin 22528 -> 22528 bytes
tests/lettuce/features/queries.feature | 18 ++++++++++++++++++
tests/lettuce/features/terrain/terrain.py | 4 ++++
7 files changed, 32 insertions(+), 3 deletions(-)
copy tests/lettuce/configurations/{example.org.config.orig => root.config.orig} (71%)
copy src/lib/datasrc/tests/testdata/test-root.sqlite3 => tests/lettuce/data/root.sqlite3.orig (100%)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 31068ae..9551cad 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -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
diff --git a/tests/lettuce/configurations/.gitignore b/tests/lettuce/configurations/.gitignore
index 69d136f..db54954 100644
--- a/tests/lettuce/configurations/.gitignore
+++ b/tests/lettuce/configurations/.gitignore
@@ -1,2 +1,3 @@
/bindctl_commands.config
/example.org.config
+/root.config
diff --git a/tests/lettuce/configurations/root.config.orig b/tests/lettuce/configurations/root.config.orig
new file mode 100644
index 0000000..282b7d1
--- /dev/null
+++ b/tests/lettuce/configurations/root.config.orig
@@ -0,0 +1,40 @@
+{
+ "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" }
+ }
+ }
+}
diff --git a/tests/lettuce/data/.gitignore b/tests/lettuce/data/.gitignore
index 946228c..da78834 100644
--- a/tests/lettuce/data/.gitignore
+++ b/tests/lettuce/data/.gitignore
@@ -1,4 +1,5 @@
/inmem-xfrin.sqlite3
+/root.sqlite3
/test_nonexistent_db.sqlite3
/xfrin-before-diffs.sqlite3
/xfrin-notify.sqlite3
diff --git a/tests/lettuce/data/root.sqlite3.orig b/tests/lettuce/data/root.sqlite3.orig
new file mode 100644
index 0000000..1bef761
Binary files /dev/null and b/tests/lettuce/data/root.sqlite3.orig differ
diff --git a/tests/lettuce/features/queries.feature b/tests/lettuce/features/queries.feature
index 2db6c3e..30e3c6b 100644
--- a/tests/lettuce/features/queries.feature
+++ b/tests/lettuce/features/queries.feature
@@ -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
diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index d0ba4fe..66727bf 100644
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -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",
More information about the bind10-changes
mailing list