Commit e121e2ed authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

always try xfrout connection regardless of the availability of boost.python.

without boost.python we'll simply reject xfr requests upon receiving exception.
this exception-based approach is not efficient, but should be okay because this is a shortterm workaround.


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac221@2319 e5f2f494-b856-4b98-b285-d166d9295462
parent b49ee3e5
......@@ -51,10 +51,8 @@ b10_auth_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
b10_auth_LDADD += $(top_builddir)/src/bin/auth/libasio_link.a
b10_auth_LDADD += $(SQLITE_LIBS)
if HAVE_BOOST_PYTHON
b10_auth_LDADD += $(top_builddir)/src/lib/xfr/.libs/libxfr.a
endif
b10_auth_LDADD += $(SQLITE_LIBS)
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
# and can't use @datadir@ because doesn't expand default ${prefix}
......
......@@ -44,10 +44,7 @@
#include <cc/data.h>
#if defined(HAVE_BOOST_PYTHON)
#define USE_XFROUT
#include <xfr/xfrout_client.h>
#endif
#include <auth/common.h>
#include <auth/auth_srv.h>
......@@ -63,9 +60,7 @@ using namespace isc::dns;
using namespace isc::dns::rdata;
using namespace isc::data;
using namespace isc::config;
#ifdef USE_XFROUT
using namespace isc::xfr;
#endif
using namespace asio_link;
class AuthSrvImpl {
......@@ -81,9 +76,9 @@ public:
bool processNormalQuery(const IOMessage& io_message, Message& message,
MessageRenderer& response_renderer);
bool processAxfrQuery(const IOMessage& io_message, Message& message,
MessageRenderer& response_renderer) ;
MessageRenderer& response_renderer);
bool processNotify(const IOMessage& io_message, Message& message,
MessageRenderer& response_renderer) ;
MessageRenderer& response_renderer);
std::string db_file_;
ModuleCCSession* cs_;
MetaDataSrc data_sources_;
......@@ -328,7 +323,7 @@ AuthSrvImpl::processNormalQuery(const IOMessage& io_message, Message& message,
return (true);
}
#ifdef USE_XFROUT
bool
AuthSrvImpl::processAxfrQuery(const IOMessage& io_message, Message& message,
MessageRenderer& response_renderer)
......@@ -371,18 +366,6 @@ AuthSrvImpl::processAxfrQuery(const IOMessage& io_message, Message& message,
}
return (false);
}
#else
bool
AuthSrvImpl::processAxfrQuery(
const IOMessage& io_message UNUSED_PARAM,
Message& message UNUSED_PARAM,
MessageRenderer& response_renderer UNUSED_PARAM) const
{
// should better to return an error message, but hopefully this case
// is short term workaround.
return (false);
}
#endif
bool
AuthSrvImpl::processNotify(const IOMessage& io_message, Message& message,
......
SUBDIRS = exceptions dns cc config datasrc python
if HAVE_BOOST_PYTHON
SUBDIRS += xfr
endif
SUBDIRS = exceptions dns cc config datasrc python xfr
Markdown is supported
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