Commit c1493731 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

Merge branch 'master' into trac2105

parents 2b062467 862b15fc
457. [build]* muks
BIND 10 library names now have a "b10-" prefix. This is to avoid
clashes with other similarly named libraries on the system.
(Trac #2071, git ac20a00c28069804edc0a36050995df52f601efb)
456. [build]* muks
BIND 10 now compiles against log4cplus-1.1.0 (RC releases)
also. Note: some older versions of log4cplus don't work any more;
known oldest workable version is 1.0.4. Thanks to John Lumby for
sending a patch.
(Trac #2169, git 7d7e5269d57451191c0aef1b127d292d3615fe2c)
455. [func]* vorner
The server now uses newer API for data sources. This would be an
internal change, however, the data sources are now configured
......
......@@ -8,4 +8,4 @@ Description: BIND 10 DNS library
Version: @PACKAGE_VERSION@
Requires: botan-1.8
Cflags: -I${includedir}/@PACKAGE_NAME@
Libs: -L${libdir} -ldns++ -lcryptolink -lutil -lexceptions -lm
Libs: -L${libdir} -lb10-dns++ -lb10-cryptolink -lb10-util -lb10-exceptions -lm
......@@ -573,7 +573,8 @@ WARN_LOGFILE =
# with spaces.
INPUT = ../src/lib/exceptions ../src/lib/cc \
../src/lib/config ../src/lib/cryptolink ../src/lib/dns ../src/lib/datasrc \
../src/lib/config ../src/lib/cryptolink ../src/lib/dns \
../src/lib/datasrc ../src/lib/datasrc/memory \
../src/bin/auth ../src/bin/resolver ../src/lib/bench ../src/lib/log \
../src/lib/log/compiler ../src/lib/asiolink/ ../src/lib/nsas \
../src/lib/testutils ../src/lib/cache ../src/lib/server_common/ \
......
......@@ -60,19 +60,19 @@ b10_auth_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
nodist_b10_auth_SOURCES = auth_messages.h auth_messages.cc
EXTRA_DIST += auth_messages.mes
b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la
b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_auth_LDADD += $(top_builddir)/src/lib/log/liblog.la
b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
b10_auth_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
b10_auth_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
b10_auth_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
b10_auth_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
b10_auth_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
b10_auth_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
b10_auth_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
b10_auth_LDADD += $(SQLITE_LIBS)
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
......
......@@ -26,19 +26,19 @@ query_bench_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc
query_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
query_bench_LDADD += $(top_builddir)/src/lib/util/libutil.la
query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
query_bench_LDADD += $(top_builddir)/src/lib/bench/libbench.la
query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
query_bench_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la
query_bench_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
query_bench_LDADD += $(top_builddir)/src/lib/log/liblog.la
query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
query_bench_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
query_bench_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
query_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
query_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
query_bench_LDADD += $(top_builddir)/src/lib/bench/libb10-bench.la
query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
query_bench_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
query_bench_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
query_bench_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
query_bench_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
query_bench_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
query_bench_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
query_bench_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
query_bench_LDADD += $(SQLITE_LIBS)
......@@ -64,21 +64,21 @@ nodist_run_unittests_SOURCES = ../auth_messages.h ../auth_messages.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(top_builddir)/src/lib/testutils/libtestutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
run_unittests_LDADD = $(top_builddir)/src/lib/testutils/libb10-testutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/tests/libfake_session.la
run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDADD += $(SQLITE_LIBS)
......
/badExampleQuery_fromWire.wire
/examplequery_fromWire.wire
/iqueryresponse_fromWire.wire
/multiquestion_fromWire.wire
/queryBadEDNS_fromWire.wire
/shortanswer_fromWire.wire
/simplequery_fromWire.wire
/simpleresponse_fromWire.wire
......@@ -3,4 +3,3 @@
"module_name": "test"
}
}
/datasrc.spec
/datasrc.spec.pre
......@@ -16,20 +16,64 @@
from isc.config.module_spec import module_spec_from_file
from isc.util.file import path_search
from bind10_config import PLUGIN_PATHS
import isc.dns
import isc.datasrc
import json
import os.path
import copy
spec = module_spec_from_file(path_search('datasrc.spec', PLUGIN_PATHS))
def check(config):
"""
Check the configuration.
"""
# TODO: Once we have solved ticket #2051, create the list and
# fill it with the configuration. We probably want to have some way
# to not load the data sources, just the configuration. It could
# be hacked together by subclassing ConfigurableClientList and
# having empty getDataSource method. But it looks like a hack and it
# won't really check the params configuration.
#
# For now, we let everything pass.
# Check the data layout first
errors=[]
if not spec.validate_config(False, config, errors):
return ' '.join(errors)
classes = config.get('classes')
# Nothing passed here
if classes is None:
return None
for rr_class_str in classes:
try:
rr_class = isc.dns.RRClass(rr_class_str)
except isc.dns.InvalidRRClass as irc:
return "The class '" + rr_class_str + "' is invalid"
dlist = isc.datasrc.ConfigurableClientList(rr_class)
# We get a copy here, as we are going to mangle the configuration.
# But we don't want our changes to propagate outside, to the real
# configuration.
client_config = copy.deepcopy(classes.get(rr_class_str))
for client in client_config:
if client['type'] == 'MasterFiles':
if not client.get('cache-enable', False):
return 'The cache must be enabled in MasterFiles type'
params = client.get('params')
if type(params) != dict:
return 'Params of MasterFiles must be a named set'
for name in params:
try:
isc.dns.Name(name)
except Exception as e: # There are many related exceptions
return str(e)
if not os.path.exists(params[name]):
return "Master file " + params[name] + " does not exist"
# We remove the list of zones locally. We already checked them,
# and the client list would have skipped them anyway, as we
# forbid cache. But it would produce a warning and we don't
# want that here.
client['params'] = {}
try:
dlist.configure(json.dumps(client_config), False)
except isc.datasrc.Error as dse:
return str(dse)
return None
def load():
......
......@@ -16,12 +16,36 @@
# Make sure we can load the module, put it into path
import sys
import os
import unittest
import json
sys.path.extend(os.environ["B10_TEST_PLUGIN_DIR"].split(':'))
import isc.log
import datasrc_config_plugin
import unittest
class DatasrcTest(unittest.TestCase):
def reject(self, config):
"""
Just a shortcut to check the config is rejected.
"""
old = json.dumps(config)
self.assertIsNotNone(datasrc_config_plugin.check({"classes":
config}))
# There's some data mangling inside the plugin. Check it does
# not propagate out, as it could change the real configuration.
self.assertEqual(old, json.dumps(config))
def accept(self, config):
"""
Just a shortcut to check the config is accepted.
"""
old = json.dumps(config)
self.assertIsNone(datasrc_config_plugin.check({"classes":
config}))
# There's some data mangling inside the plugin. Check it does
# not propagate out, as it could change the real configuration.
self.assertEqual(old, json.dumps(config))
def test_load(self):
"""
Checks the entry point returns the correct values.
......@@ -32,5 +56,104 @@ class DatasrcTest(unittest.TestCase):
# The plugin stores it's spec
self.assertEqual(spec, datasrc_config_plugin.spec)
def test_empty(self):
"""
Check an empty input is OK.
"""
self.accept({})
def test_invalid_spec(self):
"""
Check it rejects stuff that is not well-formed according
to the spec.
"""
self.reject("test")
self.reject(13)
self.reject([])
self.reject({"IN": {}})
self.reject({"IN": [{"bad-name": True}]})
def test_class(self):
"""
The class is rejected, if it is wrong.
"""
self.reject({"BAD": []})
self.reject({"": []})
# But with a good one, it works
for c in ["IN", "CH", "HS"]:
self.accept({c: []})
def test_mem_ok(self):
"""
Test we accept an in-memory data source. It doesn't really matter
which one it is. We just want to make sure we accept something
and this one does not need any kind of path mangling to find
plugins.
"""
self.accept({"IN": [{
"type": "MasterFiles",
"cache-enable": True,
"params": {}
}]})
def test_dstype_bad(self):
"""
The configuration is correct by the spec, but it would be rejected
by the client list. Check we reject it.
"""
self.reject({"IN": [{
"type": "No such type"
}]})
def test_invalid_mem_params(self):
"""
The client list skips in-memory sources. So we check it locally that
invalid things are rejected.
"""
# The 'params' key is mandatory for MasterFiles
self.reject({"IN": [{
"type": "MasterFiles",
"cache-enable": True
}]})
# The cache must be enabled
self.reject({"IN": [{
"type": "MasterFiles",
"cache-enable": False,
"params": {}
}]})
self.reject({"IN": [{
"type": "MasterFiles",
"params": {}
}]})
# Bad params type
self.reject({"IN": [{
"type": "MasterFiles",
"cache-enable": True,
"params": []
}]})
# Bad name
self.reject({"IN": [{
"type": "MasterFiles",
"cache-enable": True,
"params": {
"example....org.": '/file/does/not/exist'
}
}]})
def test_no_such_file_mem(self):
"""
We also check the existance of master files. Not the actual content,
though.
"""
self.reject({"IN": [{
"type": "MasterFiles",
"cache-enable": True,
"params": {
"example.org.": '/file/does/not/exist'
}
}]})
if __name__ == '__main__':
unittest.main()
isc.log.init("bind10")
isc.log.resetUnitTestRootLogger()
unittest.main()
......@@ -39,12 +39,12 @@ if USE_CLANGPP
b10_dhcp4_CXXFLAGS = -Wno-unused-parameter
endif
b10_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libdhcp++.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
b10_dhcp4dir = $(pkgdatadir)
......
......@@ -82,7 +82,7 @@ void ControlledDhcpv4Srv::sessionReader(void) {
}
void ControlledDhcpv4Srv::establishSession() {
string specfile;
if (getenv("B10_FROM_BUILD")) {
specfile = string(getenv("B10_FROM_BUILD")) +
......@@ -92,9 +92,9 @@ void ControlledDhcpv4Srv::establishSession() {
}
/// @todo: Check if session is not established already. Throw, if it is.
cout << "b10-dhcp4: my specfile is " << specfile << endl;
cc_session_ = new Session(io_service_.get_io_service());
config_session_ = new ModuleCCSession(specfile, *cc_session_,
......
......@@ -81,7 +81,7 @@ main(int argc, char* argv[]) {
(verbose_mode ? isc::log::DEBUG : isc::log::INFO),
isc::log::MAX_DEBUG_LEVEL, NULL);
cout << "b10-dhcp4: My pid=" << getpid() << ", binding to port "
cout << "b10-dhcp4: My pid=" << getpid() << ", binding to port "
<< port_number << ", verbose " << (verbose_mode?"yes":"no") << endl;
if (argc - optind > 0) {
......
......@@ -60,13 +60,13 @@ endif
dhcp4_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
dhcp4_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
dhcp4_unittests_LDADD = $(GTEST_LDADD)
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
endif
noinst_PROGRAMS = $(TESTS)
......@@ -40,10 +40,10 @@ if USE_CLANGPP
b10_dhcp6_CXXFLAGS = -Wno-unused-parameter
endif
b10_dhcp6_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/liblog.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
b10_dhcp6_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
b10_dhcp6dir = $(pkgdatadir)
b10_dhcp6_DATA = dhcp6.spec
......@@ -55,10 +55,10 @@ endif
dhcp6_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
dhcp6_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
dhcp6_unittests_LDADD = $(GTEST_LDADD)
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
......
......@@ -12,9 +12,9 @@ CLEANFILES = *.gcno *.gcda
bin_PROGRAMS = b10-host
b10_host_SOURCES = host.cc
b10_host_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_host_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
b10_host_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
man_MANS = b10-host.1
EXTRA_DIST = $(man_MANS) b10-host.xml
......
......@@ -2,12 +2,12 @@
.\" Title: b10-msgq
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: August 4, 2010
.\" Date: June 25, 2012
.\" Manual: BIND10
.\" Source: BIND10
.\" Language: English
.\"
.TH "B10\-MSGQ" "8" "August 4, 2010" "BIND10" "BIND10"
.TH "B10\-MSGQ" "8" "June 25, 2012" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
......@@ -87,8 +87,6 @@ is assigned a unique identifier \-\- this is the local name\&. The commands it h
.sp
.RE
.PP
It listens on 127\&.0\&.0\&.1\&.
.PP
The
\fBb10\-msgq\fR
daemon may be cleanly stopped by sending the SIGTERM signal to the process\&. This shutdown does not notify the subscribers\&.
......
......@@ -56,20 +56,20 @@ b10_resolver_SOURCES += common.cc common.h
nodist_b10_resolver_SOURCES = resolver_messages.cc resolver_messages.h
b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
b10_resolver_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_resolver_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
b10_resolver_LDADD += $(top_builddir)/src/lib/log/liblog.la
b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libcache.la
b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
b10_resolver_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
b10_resolver_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libb10-dnsacl.la
b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
b10_resolver_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
b10_resolver_LDFLAGS = -pthread
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
......
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