Commit c05eb51a authored by Mark Andrews's avatar Mark Andrews
Browse files

388. [cleanup] dns_zone_setdbtype now has const char **dbargv.

 397.   [bug]           result was not being set in notify_send_toaddr().
                        RT#238
parent 5b148f96
388. [cleanup] dns_zone_setdbtype now has const char **dbargv.
397. [bug] result was not being set in notify_send_toaddr().
RT#238
396. [doc] There is now a man page for "nsupdate"
in doc/man/bin/nsupdate.8.
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.h,v 1.69 2000/08/13 23:51:55 gson Exp $ */
/* $Id: zone.h,v 1.70 2000/08/16 02:16:49 marka Exp $ */
#ifndef DNS_ZONE_H
#define DNS_ZONE_H 1
......@@ -271,7 +271,7 @@ dns_zone_getdb(dns_zone_t *zone, dns_db_t **dbp);
isc_result_t
dns_zone_setdbtype(dns_zone_t *zone,
unsigned int dbargc, char **dbargv);
unsigned int dbargc, const char **dbargv);
/*
* Sets the database type to dbargv[0] and database arguments
* to subsequent dbargv elements.
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.183 2000/08/13 23:51:52 gson Exp $ */
/* $Id: zone.c,v 1.184 2000/08/16 02:16:47 marka Exp $ */
#include <config.h>
......@@ -388,8 +388,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
zone->magic = ZONE_MAGIC;
/* Must be after magic is set. */
result = dns_zone_setdbtype(zone, dbargc_default,
(char **) dbargv_default);
result = dns_zone_setdbtype(zone, dbargc_default, dbargv_default);
if (result != ISC_R_SUCCESS)
goto free_mutex;
......@@ -538,7 +537,7 @@ zone_freedbargs(dns_zone_t *zone) {
isc_result_t
dns_zone_setdbtype(dns_zone_t *zone,
unsigned int dbargc, char **dbargv) {
unsigned int dbargc, const char **dbargv) {
isc_result_t result = ISC_R_SUCCESS;
char **new = NULL;
unsigned int i;
......@@ -1933,8 +1932,10 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
dns_zone_iattach(notify->zone, &zone);
if (DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_LOADED) == 0)
if (DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_LOADED) == 0) {
result = ISC_R_CANCELED;
goto cleanup;
}
if ((event->ev_attributes & ISC_EVENTATTR_CANCELED) != 0 ||
DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_EXITING)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment