[svn] commit: r3266 - in /branches/trac327/src/bin/recurse: Makefile.am change_user.cc change_user.h common.h main.cc tests/recursor_unittest.cc

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Oct 19 01:48:32 UTC 2010


Author: each
Date: Tue Oct 19 01:48:31 2010
New Revision: 3266

Log:
recursor now references auth/change_user.cc and auth/common.h instead of
having its own copies of them.  (these files, along with other common code
in auth_srv.cc and recursor.cc, still need to be moved into a library.)

Removed:
    branches/trac327/src/bin/recurse/change_user.cc
    branches/trac327/src/bin/recurse/change_user.h
    branches/trac327/src/bin/recurse/common.h
Modified:
    branches/trac327/src/bin/recurse/Makefile.am
    branches/trac327/src/bin/recurse/main.cc
    branches/trac327/src/bin/recurse/tests/recursor_unittest.cc

Modified: branches/trac327/src/bin/recurse/Makefile.am
==============================================================================
--- branches/trac327/src/bin/recurse/Makefile.am (original)
+++ branches/trac327/src/bin/recurse/Makefile.am Tue Oct 19 01:48:31 2010
@@ -37,8 +37,8 @@
 BUILT_SOURCES = spec_config.h 
 pkglibexec_PROGRAMS = b10-recurse
 b10_recurse_SOURCES = recursor.cc recursor.h
-b10_recurse_SOURCES += change_user.cc change_user.h
-b10_recurse_SOURCES += common.h
+b10_recurse_SOURCES += $(top_builddir)/src/bin/auth/change_user.h
+b10_recurse_SOURCES += $(top_builddir)/src/bin/auth/common.h
 b10_recurse_SOURCES += main.cc
 b10_recurse_LDADD =  $(top_builddir)/src/lib/dns/libdns++.la
 b10_recurse_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
@@ -46,6 +46,7 @@
 b10_recurse_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 b10_recurse_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
 b10_recurse_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
+b10_recurse_LDADD += $(top_builddir)/src/bin/auth/change_user.o
 b10_recurse_LDFLAGS = -pthread
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir

Modified: branches/trac327/src/bin/recurse/main.cc
==============================================================================
--- branches/trac327/src/bin/recurse/main.cc (original)
+++ branches/trac327/src/bin/recurse/main.cc Tue Oct 19 01:48:31 2010
@@ -41,9 +41,10 @@
 
 #include <xfr/xfrout_client.h>
 
+#include <auth/change_user.h>
+#include <auth/common.h>
+
 #include <recurse/spec_config.h>
-#include <recurse/common.h>
-#include <recurse/change_user.h>
 #include <recurse/recursor.h>
 
 using namespace std;

Modified: branches/trac327/src/bin/recurse/tests/recursor_unittest.cc
==============================================================================
--- branches/trac327/src/bin/recurse/tests/recursor_unittest.cc (original)
+++ branches/trac327/src/bin/recurse/tests/recursor_unittest.cc Tue Oct 19 01:48:31 2010
@@ -30,8 +30,9 @@
 #include <cc/data.h>
 #include <cc/session.h>
 
+#include <auth/common.h>
+
 #include <recurse/recursor.h>
-#include <recurse/common.h>
 
 #include <dns/tests/unittest_util.h>
 




More information about the bind10-changes mailing list