[svn] commit: r1799 - in /trunk: ./ src/bin/auth/ src/bin/auth/tests/ src/bin/loadzone/ src/bin/xfrin/ src/bin/xfrout/ src/lib/ src/lib/auth/ src/lib/datasrc/ src/lib/datasrc/tests/ src/lib/datasrc/tests/testdata/ src/lib/python/isc/ src/lib/python/isc/auth/ src/lib/python/isc/datasrc/
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Apr 29 13:22:40 UTC 2010
Author: each
Date: Thu Apr 29 13:22:39 2010
New Revision: 1799
Log:
Change libauth to libdatasrc
Added:
trunk/src/lib/datasrc/
trunk/src/lib/datasrc/Makefile.am
- copied, changed from r1798, trunk/src/lib/auth/Makefile.am
trunk/src/lib/datasrc/TODO
- copied, changed from r1798, trunk/src/lib/auth/TODO
trunk/src/lib/datasrc/data_source.cc
- copied, changed from r1798, trunk/src/lib/auth/data_source.cc
trunk/src/lib/datasrc/data_source.h
- copied, changed from r1798, trunk/src/lib/auth/data_source.h
trunk/src/lib/datasrc/query.cc
- copied, changed from r1798, trunk/src/lib/auth/query.cc
trunk/src/lib/datasrc/query.h
- copied, changed from r1798, trunk/src/lib/auth/query.h
trunk/src/lib/datasrc/sqlite3_datasrc.cc
- copied, changed from r1798, trunk/src/lib/auth/sqlite3_datasrc.cc
trunk/src/lib/datasrc/sqlite3_datasrc.h
- copied, changed from r1798, trunk/src/lib/auth/sqlite3_datasrc.h
trunk/src/lib/datasrc/static_datasrc.cc
- copied, changed from r1798, trunk/src/lib/auth/static_datasrc.cc
trunk/src/lib/datasrc/static_datasrc.h
- copied, changed from r1798, trunk/src/lib/auth/static_datasrc.h
trunk/src/lib/datasrc/tests/
trunk/src/lib/datasrc/tests/Makefile.am
- copied, changed from r1798, trunk/src/lib/auth/tests/Makefile.am
trunk/src/lib/datasrc/tests/datasrc_unittest.cc
- copied, changed from r1798, trunk/src/lib/auth/tests/datasrc_unittest.cc
trunk/src/lib/datasrc/tests/query_unittest.cc
- copied, changed from r1798, trunk/src/lib/auth/tests/query_unittest.cc
trunk/src/lib/datasrc/tests/run_unittests.cc
- copied, changed from r1798, trunk/src/lib/auth/tests/run_unittests.cc
trunk/src/lib/datasrc/tests/sqlite3_unittest.cc
- copied, changed from r1798, trunk/src/lib/auth/tests/sqlite3_unittest.cc
trunk/src/lib/datasrc/tests/static_unittest.cc
- copied, changed from r1798, trunk/src/lib/auth/tests/static_unittest.cc
trunk/src/lib/datasrc/tests/test_datasrc.cc
- copied, changed from r1798, trunk/src/lib/auth/tests/test_datasrc.cc
trunk/src/lib/datasrc/tests/test_datasrc.h
- copied, changed from r1798, trunk/src/lib/auth/tests/test_datasrc.h
trunk/src/lib/datasrc/tests/testdata/
trunk/src/lib/datasrc/tests/testdata/brokendb.sqlite3 (contents, props changed)
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/brokendb.sqlite3
trunk/src/lib/datasrc/tests/testdata/example.com.signed
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/example.com.signed
trunk/src/lib/datasrc/tests/testdata/example.org
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/example.org
trunk/src/lib/datasrc/tests/testdata/example.org.sqlite3 (contents, props changed)
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/example.org.sqlite3
trunk/src/lib/datasrc/tests/testdata/example2.com
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/example2.com
trunk/src/lib/datasrc/tests/testdata/example2.com.sqlite3 (contents, props changed)
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/example2.com.sqlite3
trunk/src/lib/datasrc/tests/testdata/mkbrokendb.c
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/mkbrokendb.c
trunk/src/lib/datasrc/tests/testdata/q_cname
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_cname
trunk/src/lib/datasrc/tests/testdata/q_cname_ext
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_cname_ext
trunk/src/lib/datasrc/tests/testdata/q_cname_int
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_cname_int
trunk/src/lib/datasrc/tests/testdata/q_dname
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_dname
trunk/src/lib/datasrc/tests/testdata/q_example_ns
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_example_ns
trunk/src/lib/datasrc/tests/testdata/q_example_ptr
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_example_ptr
trunk/src/lib/datasrc/tests/testdata/q_glork
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_glork
trunk/src/lib/datasrc/tests/testdata/q_spork
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_spork
trunk/src/lib/datasrc/tests/testdata/q_sql1
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_sql1
trunk/src/lib/datasrc/tests/testdata/q_subzone
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_subzone
trunk/src/lib/datasrc/tests/testdata/q_subzone_any
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_subzone_any
trunk/src/lib/datasrc/tests/testdata/q_subzone_dname
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_subzone_dname
trunk/src/lib/datasrc/tests/testdata/q_subzone_ds
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_subzone_ds
trunk/src/lib/datasrc/tests/testdata/q_subzone_ns
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_subzone_ns
trunk/src/lib/datasrc/tests/testdata/q_subzone_nsec
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_subzone_nsec
trunk/src/lib/datasrc/tests/testdata/q_wild2_a
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_wild2_a
trunk/src/lib/datasrc/tests/testdata/q_wild2_aaaa
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_wild2_aaaa
trunk/src/lib/datasrc/tests/testdata/q_wild3_a
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_wild3_a
trunk/src/lib/datasrc/tests/testdata/q_wild_a
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_wild_a
trunk/src/lib/datasrc/tests/testdata/q_wild_aaaa
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/q_wild_aaaa
trunk/src/lib/datasrc/tests/testdata/root.zone
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/root.zone
trunk/src/lib/datasrc/tests/testdata/sql1.example.com.signed
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/sql1.example.com.signed
trunk/src/lib/datasrc/tests/testdata/sql2.example.com.signed
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/sql2.example.com.signed
trunk/src/lib/datasrc/tests/testdata/test-root.sqlite3 (contents, props changed)
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/test-root.sqlite3
trunk/src/lib/datasrc/tests/testdata/test.sqlite3 (contents, props changed)
- copied, changed from r1798, trunk/src/lib/auth/tests/testdata/test.sqlite3
trunk/src/lib/python/isc/datasrc/
trunk/src/lib/python/isc/datasrc/Makefile.am
- copied, changed from r1798, trunk/src/lib/python/isc/auth/Makefile.am
trunk/src/lib/python/isc/datasrc/__init__.py
- copied, changed from r1798, trunk/src/lib/python/isc/auth/__init__.py
trunk/src/lib/python/isc/datasrc/master.py
- copied, changed from r1798, trunk/src/lib/python/isc/auth/master.py
trunk/src/lib/python/isc/datasrc/sqlite3_ds.py
- copied, changed from r1798, trunk/src/lib/python/isc/auth/sqlite3_ds.py
Removed:
trunk/src/lib/auth/
trunk/src/lib/python/isc/auth/
Modified:
trunk/configure.ac
trunk/src/bin/auth/Makefile.am
trunk/src/bin/auth/auth_srv.cc
trunk/src/bin/auth/tests/Makefile.am
trunk/src/bin/loadzone/b10-loadzone.py.in
trunk/src/bin/xfrin/xfrin.py.in
trunk/src/bin/xfrout/xfrout.py.in
trunk/src/lib/Makefile.am
trunk/src/lib/python/isc/Makefile.am
trunk/src/lib/python/isc/__init__.py
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Apr 29 13:22:39 2010
@@ -391,7 +391,7 @@
src/lib/cc/Makefile
src/lib/python/Makefile
src/lib/python/isc/Makefile
- src/lib/python/isc/auth/Makefile
+ src/lib/python/isc/datasrc/Makefile
src/lib/python/isc/cc/Makefile
src/lib/python/isc/cc/tests/Makefile
src/lib/python/isc/config/Makefile
@@ -401,8 +401,8 @@
src/lib/dns/Makefile
src/lib/dns/tests/Makefile
src/lib/exceptions/Makefile
- src/lib/auth/Makefile
- src/lib/auth/tests/Makefile
+ src/lib/datasrc/Makefile
+ src/lib/datasrc/tests/Makefile
src/lib/xfr/Makefile
])
AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
Modified: trunk/src/bin/auth/Makefile.am
==============================================================================
--- trunk/src/bin/auth/Makefile.am (original)
+++ trunk/src/bin/auth/Makefile.am Thu Apr 29 13:22:39 2010
@@ -27,8 +27,8 @@
b10_auth_SOURCES = auth_srv.cc auth_srv.h
b10_auth_SOURCES += common.h
b10_auth_SOURCES += main.cc
-b10_auth_LDADD = $(top_builddir)/src/lib/auth/.libs/libauth.a
-b10_auth_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a
+b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/.libs/libdatasrc.a
+b10_auth_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a
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
Modified: trunk/src/bin/auth/auth_srv.cc
==============================================================================
--- trunk/src/bin/auth/auth_srv.cc (original)
+++ trunk/src/bin/auth/auth_srv.cc Thu Apr 29 13:22:39 2010
@@ -33,10 +33,10 @@
#include <cc/data.h>
#include <exceptions/exceptions.h>
-#include <auth/query.h>
-#include <auth/data_source.h>
-#include <auth/static_datasrc.h>
-#include <auth/sqlite3_datasrc.h>
+#include <datasrc/query.h>
+#include <datasrc/data_source.h>
+#include <datasrc/static_datasrc.h>
+#include <datasrc/sqlite3_datasrc.h>
#include <cc/data.h>
@@ -48,7 +48,7 @@
using namespace std;
using namespace isc;
-using namespace isc::auth;
+using namespace isc::datasrc;
using namespace isc::dns;
using namespace isc::dns::rdata;
using namespace isc::data;
Modified: trunk/src/bin/auth/tests/Makefile.am
==============================================================================
--- trunk/src/bin/auth/tests/Makefile.am (original)
+++ trunk/src/bin/auth/tests/Makefile.am Thu Apr 29 13:22:39 2010
@@ -16,7 +16,7 @@
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(SQLITE_LIBS)
-run_unittests_LDADD += $(top_builddir)/src/lib/auth/.libs/libauth.a
+run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/.libs/libdatasrc.a
run_unittests_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a
run_unittests_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a
Modified: trunk/src/bin/loadzone/b10-loadzone.py.in
==============================================================================
--- trunk/src/bin/loadzone/b10-loadzone.py.in (original)
+++ trunk/src/bin/loadzone/b10-loadzone.py.in Thu Apr 29 13:22:39 2010
@@ -17,8 +17,8 @@
import sys; sys.path.append ('@@PYTHONPATH@@')
import re, getopt
-import isc.auth
-from isc.auth.master import MasterFile
+import isc.datasrc
+from isc.datasrc.master import MasterFile
#########################################################################
# usage: print usage note and exit
@@ -71,10 +71,10 @@
exit(1)
try:
- isc.auth.sqlite3_ds.load(dbfile, zone, master.zonedata)
+ isc.datasrc.sqlite3_ds.load(dbfile, zone, master.zonedata)
except Exception as e:
print("Error loading database: " + str(e))
exit(1)
if __name__ == "__main__":
- main()
+ main(datasrc
Modified: trunk/src/bin/xfrin/xfrin.py.in
==============================================================================
--- trunk/src/bin/xfrin/xfrin.py.in (original)
+++ trunk/src/bin/xfrin/xfrin.py.in Thu Apr 29 13:22:39 2010
@@ -165,8 +165,8 @@
if ret == XFRIN_OK:
self.log_msg(logstr + 'started')
self._send_query(rr_type.AXFR())
- isc.auth.sqlite3_ds.load(self._db_file, self._zone_name,
- self._handle_xfrin_response)
+ isc.datasrc.sqlite3_ds.load(self._db_file, self._zone_name,
+ self._handle_xfrin_response)
self.log_msg(logstr + 'succeeded')
@@ -174,7 +174,7 @@
self.log_msg(e)
self.log_msg(logstr + 'failed')
#TODO, recover data source.
- except isc.auth.sqlite3_ds.Sqlite3DSError as e:
+ except isc.datasrc.sqlite3_ds.Sqlite3DSError as e:
self.log_msg(e)
self.log_msg(logstr + 'failed')
finally:
Modified: trunk/src/bin/xfrout/xfrout.py.in
==============================================================================
--- trunk/src/bin/xfrout/xfrout.py.in (original)
+++ trunk/src/bin/xfrout/xfrout.py.in Thu Apr 29 13:22:39 2010
@@ -22,7 +22,7 @@
import threading
import struct
import signal
-from isc.auth import sqlite3_ds
+from isc.datasrc import sqlite3_ds
from socketserver import *
import os
from isc.config.ccsession import *
Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am (original)
+++ trunk/src/lib/Makefile.am Thu Apr 29 13:22:39 2010
@@ -1,4 +1,4 @@
-SUBDIRS = exceptions dns cc config auth python
+SUBDIRS = exceptions dns cc config datasrc python
if HAVE_BOOST_PYTHON
if HAVE_BOOST_SYSTEM
SUBDIRS += xfr
Modified: trunk/src/lib/python/isc/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/Makefile.am (original)
+++ trunk/src/lib/python/isc/Makefile.am Thu Apr 29 13:22:39 2010
@@ -1,4 +1,4 @@
-SUBDIRS = auth cc config # Util
+SUBDIRS = datasrc cc config # Util
python_PYTHON = __init__.py
Modified: trunk/src/lib/python/isc/__init__.py
==============================================================================
--- trunk/src/lib/python/isc/__init__.py (original)
+++ trunk/src/lib/python/isc/__init__.py Thu Apr 29 13:22:39 2010
@@ -1,3 +1,3 @@
-import isc.auth
+import isc.datasrc
import isc.cc
import isc.config
More information about the bind10-changes
mailing list