diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2009-06-24 15:04:37 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-06-24 15:04:37 -0600 |
| commit | 2306fd1207ccddc925d7b42b9842a29db6e81e40 (patch) | |
| tree | d37e2702192c823d7464236ed36aa22a3399ac6c /contrib | |
| parent | 6a93ff6c448c912489acbc6f07845a90575e0996 (diff) | |
| download | bind9-2306fd1207ccddc925d7b42b9842a29db6e81e40.tar.gz | |
9.7.0a1
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dlz/drivers/dlz_bdb_driver.c | 2 | ||||
| -rw-r--r-- | contrib/dlz/drivers/dlz_mysql_driver.c | 14 | ||||
| -rw-r--r-- | contrib/dnssec-tools/README | 9 | ||||
| -rw-r--r-- | contrib/sdb/pgsql/zonetodb.c | 6 |
4 files changed, 17 insertions, 14 deletions
diff --git a/contrib/dlz/drivers/dlz_bdb_driver.c b/contrib/dlz/drivers/dlz_bdb_driver.c index 5aa96a59..ebbb6dda 100644 --- a/contrib/dlz/drivers/dlz_bdb_driver.c +++ b/contrib/dlz/drivers/dlz_bdb_driver.c @@ -558,8 +558,6 @@ bdb_lookup(const char *zone, const char *name, void *driverarg, host_cursor->c_close(host_cursor); return result; - - return ISC_R_NOTFOUND; } diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c index ea32d39e..5d2739b1 100644 --- a/contrib/dlz/drivers/dlz_mysql_driver.c +++ b/contrib/dlz/drivers/dlz_mysql_driver.c @@ -792,6 +792,9 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], char *endp; int j; unsigned int flags = 0; +#ifdef MYSQL_OPT_RECONNECT + my_bool auto_reconnect = 1; +#endif UNUSED(driverarg); UNUSED(dlzname); @@ -923,6 +926,17 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], pass = getParameterValue(argv[1], "pass="); socket = getParameterValue(argv[1], "socket="); +#ifdef MYSQL_OPT_RECONNECT + /* enable automatic reconnection. */ + if (mysql_options((MYSQL *) dbi->dbconn, MYSQL_OPT_RECONNECT, + &auto_reconnect) != 0) { + isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, + DNS_LOGMODULE_DLZ, ISC_LOG_WARNING, + "mysql driver failed to set " + "MYSQL_OPT_RECONNECT option, continuing"); + } +#endif + for (j=0; dbc == NULL && j < 4; j++) dbc = mysql_real_connect((MYSQL *) dbi->dbconn, host, user, pass, dbname, port, socket, diff --git a/contrib/dnssec-tools/README b/contrib/dnssec-tools/README deleted file mode 100644 index d45b75ab..00000000 --- a/contrib/dnssec-tools/README +++ /dev/null @@ -1,9 +0,0 @@ - - DNSSEC Tools - - DNSSEC tools from SPARTA is a useful tools set in particular - "trustman" which can be used to manage trusted-keys in named.conf. - - http://www.dnssec-tools.org/ - - http://www.dnssec-tools.org/wiki/index.php/Recursive_Server#Trustman diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c index ba93027c..61ec2644 100644 --- a/contrib/sdb/pgsql/zonetodb.c +++ b/contrib/sdb/pgsql/zonetodb.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zonetodb.c,v 1.20 2008/09/25 04:02:38 tbox Exp $ */ +/* $Id: zonetodb.c,v 1.21 2008/11/27 06:14:22 marka Exp $ */ #include <stdlib.h> #include <string.h> @@ -165,10 +165,10 @@ main(int argc, char **argv) { check_result(result, "isc_mem_create"); result = isc_entropy_create(mctx, &ectx); - result_check (result, "isc_entropy_create"); + check_result(result, "isc_entropy_create"); result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE); - check_result (result, "isc_hash_create"); + check_result(result, "isc_hash_create"); isc_buffer_init(&b, porigin, strlen(porigin)); isc_buffer_add(&b, strlen(porigin)); |