[svn] commit: r2319 - in /branches/trac221/src: bin/auth/Makefile.am bin/auth/auth_srv.cc lib/Makefile.am

[BIND 10 source code commits]

Author: jinmei
Date: Tue Jun 29 02:26:46 2010
New Revision: 2319

Log:
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.

Modified:
    branches/trac221/src/bin/auth/Makefile.am
    branches/trac221/src/bin/auth/auth_srv.cc
    branches/trac221/src/lib/Makefile.am

Modified: branches/trac221/src/bin/auth/Makefile.am
==============================================================================
--- branches/trac221/src/bin/auth/Makefile.am (original)
+++ branches/trac221/src/bin/auth/Makefile.am Tue Jun 29 02:26:46 2010
@@ -51,10 +51,8 @@
 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 += $(top_builddir)/src/lib/xfr/.libs/libxfr.a
 b10_auth_LDADD += $(SQLITE_LIBS)
-if HAVE_BOOST_PYTHON
-b10_auth_LDADD += $(top_builddir)/src/lib/xfr/.libs/libxfr.a
-endif
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}

Modified: branches/trac221/src/bin/auth/auth_srv.cc
==============================================================================
--- branches/trac221/src/bin/auth/auth_srv.cc (original)
+++ branches/trac221/src/bin/auth/auth_srv.cc Tue Jun 29 02:26:46 2010
@@ -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::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 @@
     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 @@
     return (true);
 }
 
-#ifdef USE_XFROUT
+
 bool
 AuthSrvImpl::processAxfrQuery(const IOMessage& io_message, Message& message,
                             MessageRenderer& response_renderer)
@@ -371,18 +366,6 @@
     }
     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, 

Modified: branches/trac221/src/lib/Makefile.am
==============================================================================
--- branches/trac221/src/lib/Makefile.am (original)
+++ branches/trac221/src/lib/Makefile.am Tue Jun 29 02:26:46 2010
@@ -1,4 +1,1 @@
-SUBDIRS = exceptions dns cc config datasrc python
-if HAVE_BOOST_PYTHON
-SUBDIRS += xfr
-endif
+SUBDIRS = exceptions dns cc config datasrc python xfr