Commit 023dd2cf authored by Mark Andrews's avatar Mark Andrews

reverse also-notify changes. dns_zone_setalsonotify() has relaxed its calling

convention.
Correct INSIST
parent b6e20238
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.c,v 1.25 2002/01/14 04:16:00 marka Exp $ */
/* $Id: config.c,v 1.26 2002/01/23 02:12:22 marka Exp $ */
#include <config.h>
......@@ -249,14 +249,11 @@ ns_config_getiplist(cfg_obj_t *config, cfg_obj_t *list,
isc_result_t result;
INSIST(addrsp != NULL && *addrsp == NULL);
INSIST(countp != NULL && *addrsp == 0);
INSIST(countp != NULL);
addrlist = cfg_tuple_get(list, "addresses");
count = ns_config_listcount(addrlist);
if (count == 0)
return (ISC_R_SUCCESS);
portobj = cfg_tuple_get(list, "port");
if (cfg_obj_isuint32(portobj)) {
isc_uint32_t val = cfg_obj_asuint32(portobj);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwresd.c,v 1.41 2002/01/14 04:15:59 marka Exp $ */
/* $Id: lwresd.c,v 1.42 2002/01/23 02:12:21 marka Exp $ */
/*
* Main program for the Lightweight Resolver Daemon.
......@@ -776,7 +776,7 @@ ns_lwresd_configure(isc_mem_t *mctx, cfg_obj_t *config) {
ns_lwresd_t *lwresd;
in_port_t port;
isc_sockaddr_t *addrs = NULL;
isc_uint32_t count = 0;
isc_uint32_t count;
lwres = cfg_listelt_value(element);
lwresd = NULL;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.99 2002/01/21 11:00:12 bwelling Exp $ */
/* $Id: zoneconf.c,v 1.100 2002/01/23 02:12:24 marka Exp $ */
#include <config.h>
......@@ -440,15 +440,14 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
result = ns_config_get(maps, "also-notify", &obj);
if (result == ISC_R_SUCCESS) {
isc_sockaddr_t *addrs = NULL;
isc_uint32_t addrcount = 0;
isc_uint32_t addrcount;
result = ns_config_getiplist(config, obj, 0, mctx,
&addrs, &addrcount);
if (result != ISC_R_SUCCESS)
return (result);
result = dns_zone_setalsonotify(zone, addrs,
addrcount);
if (addrs != NULL)
ns_config_putiplist(mctx, &addrs, addrcount);
ns_config_putiplist(mctx, &addrs, addrcount);
if (result != ISC_R_SUCCESS)
return (result);
} else
......
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