summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorInternet Software Consortium, Inc <@isc.org>2010-10-08 08:25:08 -0600
committerInternet Software Consortium, Inc <@isc.org>2010-10-08 08:25:08 -0600
commit887d4bc542def2306e66dc3dd26a9f51b92a9aa1 (patch)
treeb2e1fd5cf45db770490a28c6587cc291fb452fb1 /contrib
parent274f3a9719ec6152a42ab768cbec525395b61a93 (diff)
downloadbind9-887d4bc542def2306e66dc3dd26a9f51b92a9aa1.tar.gz
v9.7.2
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dlz/config.dlz.in2
-rw-r--r--contrib/sdb/sqlite/zone2sqlite.c12
2 files changed, 11 insertions, 3 deletions
diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
index f78e907a..ff3783ad 100644
--- a/contrib/dlz/config.dlz.in
+++ b/contrib/dlz/config.dlz.in
@@ -339,7 +339,7 @@ case "$use_dlz_filesystem" in
;;
*)
DLZ_ADD_DRIVER(FILESYSTEM, dlz_filesystem_driver)
-
+ DLZ_SYSTEM_TEST=dlz
AC_MSG_RESULT(yes)
;;
esac
diff --git a/contrib/sdb/sqlite/zone2sqlite.c b/contrib/sdb/sqlite/zone2sqlite.c
index 2ba63cc5..08b089e0 100644
--- a/contrib/sdb/sqlite/zone2sqlite.c
+++ b/contrib/sdb/sqlite/zone2sqlite.c
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: zone2sqlite.c,v 1.3 2009/09/01 00:22:26 jinmei Exp $ */
+/* $Id: zone2sqlite.c,v 1.3.104.1 2010/08/16 05:36:08 marka Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -27,7 +27,9 @@
#include <dns/db.h>
#include <dns/dbiterator.h>
+#include <isc/entropy.h>
#include <dns/fixedname.h>
+#include <isc/hash.h>
#include <dns/name.h>
#include <dns/rdata.h>
#include <dns/rdataset.h>
@@ -157,6 +159,7 @@ main(int argc, char *argv[])
dns_rdataset_t rdataset;
dns_rdata_t rdata = DNS_RDATA_INIT;
isc_mem_t *mctx = NULL;
+ isc_entropy_t *ectx = NULL;
isc_buffer_t b;
isc_result_t result;
@@ -173,9 +176,12 @@ main(int argc, char *argv[])
dns_result_register();
- mctx = NULL;
result = isc_mem_create(0, 0, &mctx);
check_result(result, "isc_mem_create");
+ result = isc_entropy_create(mctx, &ectx);
+ check_result(result, "isc_entropy_create");
+ result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
+ check_result(result, "isc_hash_create");
isc_buffer_init(&b, porigin, strlen(porigin));
isc_buffer_add(&b, strlen(porigin));
@@ -293,6 +299,8 @@ main(int argc, char *argv[])
dns_dbiterator_destroy(&dbiter);
dns_db_detach(&db);
+ isc_hash_destroy();
+ isc_entropy_detach(&ectx);
isc_mem_destroy(&mctx);
closeandexit(0);