Commit 1f1d36a8 authored by Andreas Gustafsson's avatar Andreas Gustafsson

Check return values or cast them to (void), as required by the coding

standards; add exceptions to the coding standards for cases where this is
not desirable
parent 9ac8796f
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.174 2001/11/30 01:02:05 gson Exp $ */
/* $Id: dig.c,v 1.175 2001/11/30 01:58:38 gson Exp $ */
#include <config.h>
#include <stdlib.h>
......@@ -216,14 +216,12 @@ void
received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
isc_uint64_t diff;
isc_time_t now;
isc_result_t result;
time_t tnow;
char fromtext[ISC_SOCKADDR_FORMATSIZE];
isc_sockaddr_format(from, fromtext, sizeof(fromtext));
result = isc_time_now(&now);
check_result(result, "isc_time_now");
TIME_NOW(&now);
if (query->lookup->stats && !short_form) {
diff = isc_time_microdiff(&now, &query->time_sent);
......@@ -285,9 +283,7 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) {
result = dns_rdata_totext(rdata, NULL, buf);
check_result(result, "dns_rdata_totext");
if (query->lookup->identify) {
result = isc_time_now(&now);
if (result != ISC_R_SUCCESS)
return (result);
TIME_NOW(&now);
diff = isc_time_microdiff(&now, &query->time_sent);
ADD_STRING(buf, " from server ");
ADD_STRING(buf, query->servname);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dighost.c,v 1.237 2001/11/27 00:55:30 gson Exp $ */
/* $Id: dighost.c,v 1.238 2001/11/30 01:58:39 gson Exp $ */
/*
* Notice to programmers: Do not use this code as an example of how to
......@@ -1660,8 +1660,7 @@ send_udp(dig_query_t *query) {
ISC_LIST_ENQUEUE(query->sendlist, &l->sendbuf,
link);
debug("sending a request");
result = isc_time_now(&query->time_sent);
check_result(result, "isc_time_now");
TIME_NOW(&query->time_sent);
INSIST(query->sock != NULL);
result = isc_socket_sendtov(query->sock, &query->sendlist,
global_task, send_done, query,
......@@ -1867,8 +1866,7 @@ launch_next_query(dig_query_t *query, isc_boolean_t include_question) {
debug("recvcount=%d",recvcount);
if (!query->first_soa_rcvd) {
debug("sending a request in launch_next_query");
result = isc_time_now(&query->time_sent);
check_result(result, "isc_time_now");
TIME_NOW(&query->time_sent);
result = isc_socket_sendv(query->sock, &query->sendlist,
global_task, send_done, query);
check_result(result, "isc_socket_sendv");
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: host.c,v 1.81 2001/11/29 01:21:19 gson Exp $ */
/* $Id: host.c,v 1.82 2001/11/30 01:58:40 gson Exp $ */
#include <config.h>
#include <stdlib.h>
......@@ -147,14 +147,12 @@ dighost_shutdown(void) {
void
received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
isc_time_t now;
isc_result_t result;
int diff;
if (!short_form) {
char fromtext[ISC_SOCKADDR_FORMATSIZE];
isc_sockaddr_format(from, fromtext, sizeof(fromtext));
result = isc_time_now(&now);
check_result(result, "isc_time_now");
TIME_NOW(&now);
diff = (int) isc_time_microdiff(&now, &query->time_sent);
printf("Received %u bytes from %s in %d ms\n",
bytes, fromtext, diff/1000);
......
......@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signzone.c,v 1.154 2001/11/29 00:39:07 bwelling Exp $ */
/* $Id: dnssec-signzone.c,v 1.155 2001/11/30 01:58:42 gson Exp $ */
#include <config.h>
......@@ -1650,7 +1650,7 @@ main(int argc, char *argv[]) {
origin = file;
gdb = NULL;
isc_time_now(&timer_start);
TIME_NOW(&timer_start);
loadzone(file, origin, rdclass, &gdb);
gorigin = dns_db_origin(gdb);
......@@ -1814,7 +1814,7 @@ main(int argc, char *argv[]) {
(void) isc_app_finish();
if (printstats) {
isc_time_now(&timer_finish);
TIME_NOW(&timer_finish);
print_stats(&timer_start, &timer_finish);
}
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.198 2001/11/16 20:01:57 gson Exp $ */
/* $Id: client.c,v 1.199 2001/11/30 01:58:43 gson Exp $ */
#include <config.h>
......@@ -1050,7 +1050,8 @@ client_addopt(ns_client_t *client) {
ISC_LIST_INIT(rdatalist->rdata);
ISC_LIST_APPEND(rdatalist->rdata, rdata, link);
dns_rdatalist_tordataset(rdatalist, rdataset);
RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset)
== ISC_R_SUCCESS);
client->opt = rdataset;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.c,v 1.22 2001/11/27 00:55:32 gson Exp $ */
/* $Id: config.c,v 1.23 2001/11/30 01:58:44 gson Exp $ */
#include <config.h>
......@@ -440,7 +440,7 @@ ns_config_getport(cfg_obj_t *config, in_port_t *portp) {
isc_result_t result;
int i;
cfg_map_get(config, "options", &options);
(void)cfg_map_get(config, "options", &options);
i = 0;
if (options != NULL)
maps[i++] = options;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwdclient.c,v 1.15 2001/11/27 00:55:33 gson Exp $ */
/* $Id: lwdclient.c,v 1.16 2001/11/30 01:58:45 gson Exp $ */
#include <config.h>
......@@ -29,6 +29,7 @@
#include <dns/log.h>
#include <named/types.h>
#include <named/log.h>
#include <named/lwresd.h>
#include <named/lwdclient.h>
......@@ -211,6 +212,7 @@ process_request(ns_lwdclient_t *client) {
void
ns_lwdclient_recv(isc_task_t *task, isc_event_t *ev) {
isc_result_t result;
ns_lwdclient_t *client = ev->ev_arg;
ns_lwdclientmgr_t *cm = client->clientmgr;
isc_socketevent_t *dev = (isc_socketevent_t *)ev;
......@@ -250,7 +252,13 @@ ns_lwdclient_recv(isc_task_t *task, isc_event_t *ev) {
isc_event_free(&ev);
dev = NULL;
ns_lwdclient_startrecv(cm);
result = ns_lwdclient_startrecv(cm);
if (result != ISC_R_SUCCESS)
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_LWRESD, ISC_LOG_ERROR,
"could not start lwres "
"client handler: %s",
isc_result_totext(result));
process_request(client);
}
......@@ -366,6 +374,7 @@ lwdclientmgr_shutdown_callback(isc_task_t *task, isc_event_t *ev) {
void
ns_lwdclient_stateidle(ns_lwdclient_t *client) {
ns_lwdclientmgr_t *cm;
isc_result_t result;
cm = client->clientmgr;
......@@ -380,7 +389,13 @@ ns_lwdclient_stateidle(ns_lwdclient_t *client) {
NS_LWDCLIENT_SETIDLE(client);
ns_lwdclient_startrecv(cm);
result = ns_lwdclient_startrecv(cm);
if (result != ISC_R_SUCCESS)
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_LWRESD, ISC_LOG_ERROR,
"could not start lwres "
"client handler: %s",
isc_result_totext(result));
}
void
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwresd.c,v 1.38 2001/11/27 00:55:36 gson Exp $ */
/* $Id: lwresd.c,v 1.39 2001/11/30 01:58:46 gson Exp $ */
/*
* Main program for the Lightweight Resolver Daemon.
......@@ -341,7 +341,7 @@ ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres,
}
searchobj = NULL;
cfg_map_get(lwres, "search", &searchobj);
(void)cfg_map_get(lwres, "search", &searchobj);
if (searchobj != NULL) {
lwresd->search = NULL;
result = ns_lwsearchlist_create(lwresd->mctx,
......@@ -615,7 +615,13 @@ listener_startclients(ns_lwreslistener_t *listener) {
LOCK(&listener->lock);
cm = ISC_LIST_HEAD(listener->cmgrs);
while (cm != NULL) {
ns_lwdclient_startrecv(cm);
result = ns_lwdclient_startrecv(cm);
if (result != ISC_R_SUCCESS)
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_LWRESD, ISC_LOG_ERROR,
"could not start lwres "
"client handler: %s",
isc_result_totext(result));
cm = ISC_LIST_NEXT(cm, link);
}
UNLOCK(&listener->lock);
......@@ -783,7 +789,7 @@ ns_lwresd_configure(isc_mem_t *mctx, cfg_obj_t *config) {
port = LWRES_UDP_PORT;
listenerslist = NULL;
cfg_map_get(lwres, "listen-on", &listenerslist);
(void)cfg_map_get(lwres, "listen-on", &listenerslist);
if (listenerslist == NULL) {
struct in_addr localhost;
isc_sockaddr_t address;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.213 2001/11/26 22:54:16 gson Exp $ */
/* $Id: query.c,v 1.214 2001/11/30 01:58:47 gson Exp $ */
#include <config.h>
......@@ -1420,7 +1420,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
*/
if (a6rdataset != NULL) {
dns_a6_reset(&client->query.a6ctx);
dns_a6_foreach(&client->query.a6ctx, a6rdataset, client->now);
(void)dns_a6_foreach(&client->query.a6ctx, a6rdataset, client->now);
}
cleanup:
......@@ -1705,7 +1705,9 @@ query_addsoa(ns_client_t *client, dns_db_t *db, isc_boolean_t zero_ttl) {
result = dns_rdataset_first(rdataset);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
dns_rdataset_current(rdataset, &rdata);
dns_rdata_tostruct(&rdata, &soa, NULL);
result = dns_rdata_tostruct(&rdata, &soa, NULL);
if (result != ISC_R_SUCCESS)
goto cleanup;
if (zero_ttl) {
rdataset->ttl = 0;
......@@ -1870,7 +1872,8 @@ query_addcnamelike(ns_client_t *client, dns_name_t *qname, dns_name_t *tname,
ISC_LIST_INIT(rdatalist->rdata);
ISC_LIST_APPEND(rdatalist->rdata, rdata, link);
dns_rdatalist_tordataset(rdatalist, rdataset);
RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset)
== ISC_R_SUCCESS);
query_addrrset(client, anamep, &rdataset, NULL, NULL,
DNS_SECTION_ANSWER);
......@@ -3072,8 +3075,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* since the synthesized CNAME is NOT in the zone.
*/
dns_name_init(tname, NULL);
query_addcnamelike(client, client->query.qname, fname,
0, &tname, dns_rdatatype_cname);
(void)query_addcnamelike(client, client->query.qname, fname,
0, &tname, dns_rdatatype_cname);
if (tname != NULL)
dns_message_puttempname(client->message, &tname);
/*
......@@ -3214,7 +3217,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
qtype == dns_rdatatype_any) &&
dns_name_equal(client->query.qname,
dns_db_origin(db))))
query_addns(client, db);
(void)query_addns(client, db);
} else if (qtype != dns_rdatatype_ns) {
if (fname != NULL)
query_releasename(client, &fname);
......@@ -3551,7 +3554,7 @@ synth_fwd_startfind(ns_client_t *client) {
ptarget = query_newname(client, dbuf, &b);
if (ptarget == NULL)
goto fail;
dns_name_copy(target, ptarget, NULL);
RUNTIME_CHECK(dns_name_copy(target, ptarget, NULL) == ISC_R_SUCCESS);
dns_adb_destroyfind(&find);
......@@ -3692,7 +3695,8 @@ synth_fwd_respond(ns_client_t *client, dns_adbfind_t *find) {
ISC_LIST_APPEND(rdatalist->rdata, rdata, link);
}
dns_rdatalist_tordataset(rdatalist, rdataset);
RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset)
== ISC_R_SUCCESS);
query_addrrset(client, &tname, &rdataset, NULL, NULL,
DNS_SECTION_ANSWER);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.364 2001/11/27 04:06:07 marka Exp $ */
/* $Id: server.c,v 1.365 2001/11/30 01:58:49 gson Exp $ */
#include <config.h>
......@@ -148,7 +148,7 @@ configure_view_acl(cfg_obj_t *vconfig, cfg_obj_t *config,
maps[i++] = cfg_tuple_get(vconfig, "options");
if (config != NULL) {
cfg_obj_t *options = NULL;
cfg_map_get(config, "options", &options);
(void)cfg_map_get(config, "options", &options);
if (options != NULL)
maps[i++] = options;
}
......@@ -424,36 +424,38 @@ configure_peer(cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
obj = NULL;
(void)cfg_map_get(cpeer, "bogus", &obj);
if (obj != NULL)
dns_peer_setbogus(peer, cfg_obj_asboolean(obj));
CHECK(dns_peer_setbogus(peer, cfg_obj_asboolean(obj)));
obj = NULL;
(void)cfg_map_get(cpeer, "provide-ixfr", &obj);
if (obj != NULL)
dns_peer_setprovideixfr(peer, cfg_obj_asboolean(obj));
CHECK(dns_peer_setprovideixfr(peer, cfg_obj_asboolean(obj)));
obj = NULL;
(void)cfg_map_get(cpeer, "request-ixfr", &obj);
if (obj != NULL)
dns_peer_setrequestixfr(peer, cfg_obj_asboolean(obj));
CHECK(dns_peer_setrequestixfr(peer, cfg_obj_asboolean(obj)));
obj = NULL;
(void)cfg_map_get(cpeer, "edns", &obj);
if (obj != NULL)
dns_peer_setsupportedns(peer, cfg_obj_asboolean(obj));
CHECK(dns_peer_setsupportedns(peer, cfg_obj_asboolean(obj)));
obj = NULL;
(void)cfg_map_get(cpeer, "transfers", &obj);
if (obj != NULL)
dns_peer_settransfers(peer, cfg_obj_asuint32(obj));
CHECK(dns_peer_settransfers(peer, cfg_obj_asuint32(obj)));
obj = NULL;
(void)cfg_map_get(cpeer, "transfer-format", &obj);
if (obj != NULL) {
str = cfg_obj_asstring(obj);
if (strcasecmp(str, "many-answers") == 0)
dns_peer_settransferformat(peer, dns_many_answers);
CHECK(dns_peer_settransferformat(peer,
dns_many_answers));
else if (strcasecmp(str, "one-answer") == 0)
dns_peer_settransferformat(peer, dns_one_answer);
CHECK(dns_peer_settransferformat(peer,
dns_one_answer));
else
INSIST(0);
}
......@@ -514,7 +516,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
cmctx = NULL;
if (config != NULL)
cfg_map_get(config, "options", &options);
(void)cfg_map_get(config, "options", &options);
i = 0;
if (vconfig != NULL) {
......@@ -596,7 +598,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
obj = NULL;
result = ns_config_get(maps, "cache-file", &obj);
if (result == ISC_R_SUCCESS) {
dns_cache_setfilename(cache, cfg_obj_asstring(obj));
CHECK(dns_cache_setfilename(cache, cfg_obj_asstring(obj)));
if (!reused_cache)
CHECK(dns_cache_load(cache));
}
......@@ -1207,7 +1209,7 @@ configure_zone(cfg_obj_t *config, cfg_obj_t *zconfig, cfg_obj_t *vconfig,
if (cfg_map_get(zoptions, "forwarders", &forwarders) == ISC_R_SUCCESS)
{
forwardtype = NULL;
cfg_map_get(zoptions, "forward", &forwardtype);
(void)cfg_map_get(zoptions, "forward", &forwardtype);
CHECK(configure_forward(config, view, origin, forwarders,
forwardtype));
}
......@@ -1639,14 +1641,15 @@ load_configuration(const char *filename, ns_server_t *server,
INSIST(result == ISC_R_SUCCESS);
interface_interval = cfg_obj_asuint32(obj) * 60;
if (interface_interval == 0) {
isc_timer_reset(server->interface_timer,
isc_timertype_inactive,
NULL, NULL, ISC_TRUE);
CHECK(isc_timer_reset(server->interface_timer,
isc_timertype_inactive,
NULL, NULL, ISC_TRUE));
} else if (server->interface_interval != interface_interval) {
isc_interval_t interval;
isc_interval_set(&interval, interface_interval, 0);
isc_timer_reset(server->interface_timer, isc_timertype_ticker,
NULL, &interval, ISC_FALSE);
CHECK(isc_timer_reset(server->interface_timer,
isc_timertype_ticker,
NULL, &interval, ISC_FALSE));
}
server->interface_interval = interface_interval;
......@@ -1658,14 +1661,15 @@ load_configuration(const char *filename, ns_server_t *server,
INSIST(result == ISC_R_SUCCESS);
heartbeat_interval = cfg_obj_asuint32(obj) * 60;
if (heartbeat_interval == 0) {
isc_timer_reset(server->heartbeat_timer,
isc_timertype_inactive,
NULL, NULL, ISC_TRUE);
CHECK(isc_timer_reset(server->heartbeat_timer,
isc_timertype_inactive,
NULL, NULL, ISC_TRUE));
} else if (server->heartbeat_interval != heartbeat_interval) {
isc_interval_t interval;
isc_interval_set(&interval, heartbeat_interval, 0);
isc_timer_reset(server->heartbeat_timer, isc_timertype_ticker,
NULL, &interval, ISC_FALSE);
CHECK(isc_timer_reset(server->heartbeat_timer,
isc_timertype_ticker,
NULL, &interval, ISC_FALSE));
}
server->heartbeat_interval = heartbeat_interval;
......@@ -2476,10 +2480,10 @@ ns_server_reloadcommand(ns_server_t *server, char *args) {
if (type == dns_zone_slave || type == dns_zone_stub)
dns_zone_refresh(zone);
else
dns_zone_load(zone);
result = dns_zone_load(zone);
dns_zone_detach(&zone);
}
return (ISC_R_SUCCESS);
return (result);
}
/*
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: os.c,v 1.55 2001/11/23 01:15:07 marka Exp $ */
/* $Id: os.c,v 1.56 2001/11/30 01:58:54 gson Exp $ */
#include <config.h>
#include <stdarg.h>
......@@ -271,7 +271,6 @@ setup_syslog(const char *progname) {
#ifdef LOG_NDELAY
options |= LOG_NDELAY;
#endif
openlog(isc_file_basename(progname), options, ISC_FACILITY);
}
......@@ -325,11 +324,11 @@ ns_os_daemonize(void) {
*/
fd = open("/dev/null", O_RDWR, 0);
if (fd != -1) {
close(STDIN_FILENO);
(void)close(STDIN_FILENO);
(void)dup2(fd, STDIN_FILENO);
close(STDOUT_FILENO);
(void)close(STDOUT_FILENO);
(void)dup2(fd, STDOUT_FILENO);
close(STDERR_FILENO);
(void)close(STDERR_FILENO);
(void)dup2(fd, STDERR_FILENO);
if (fd != STDIN_FILENO &&
fd != STDOUT_FILENO &&
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: update.c,v 1.90 2001/11/20 05:04:41 marka Exp $ */
/* $Id: update.c,v 1.91 2001/11/30 01:58:50 gson Exp $ */
#include <config.h>
......@@ -1257,9 +1257,8 @@ namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected)
result = dns_dbiterator_next(dbit))
{
dns_dbnode_t *node = NULL;
result = dns_dbiterator_current(dbit, &node, child);
CHECK(dns_dbiterator_current(dbit, &node, child));
dns_db_detachnode(db, &node);
CHECK(result);
if (! dns_name_issubdomain(child, name))
break;
CHECK(namelist_append_name(affected, child));
......@@ -1411,7 +1410,7 @@ next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname,
goto failure;
}
}
dns_dbiterator_current(dbit, &node, newname);
CHECK(dns_dbiterator_current(dbit, &node, newname));
dns_db_detachnode(db, &node);
/*
......@@ -1781,10 +1780,9 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver,
*/
CHECK(rrset_exists(db, newver, &t->name,
dns_rdatatype_nxt, 0, &flag));
if (! flag) {
add_placeholder_nxt(db, newver, &t->name,
diff);
}
if (! flag)
CHECK(add_placeholder_nxt(db, newver, &t->name,
diff));
}
}
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: xfrout.c,v 1.106 2001/11/27 00:55:37 gson Exp $ */
/* $Id: xfrout.c,v 1.107 2001/11/30 01:58:51 gson Exp $ */
#include <config.h>
......@@ -242,7 +242,7 @@ db_rr_iterator_next(db_rr_iterator_t *it) {
static void
db_rr_iterator_pause(db_rr_iterator_t *it) {
dns_dbiterator_pause(it->dbit);
RUNTIME_CHECK(dns_dbiterator_pause(it->dbit) == ISC_R_SUCCESS);
}
static void
......@@ -1326,7 +1326,7 @@ sendstream(xfrout_ctx_t *xfr) {
msg->flags = DNS_MESSAGEFLAG_QR | DNS_MESSAGEFLAG_AA;
if ((xfr->client->attributes & NS_CLIENTATTR_RA) != 0)
msg->flags |= DNS_MESSAGEFLAG_RA;
dns_message_settsigkey(msg, xfr->tsigkey);
CHECK(dns_message_settsigkey(msg, xfr->tsigkey));
CHECK(dns_message_setquerytsig(msg, xfr->lasttsig));
if (xfr->lasttsig != NULL)
isc_buffer_free(&xfr->lasttsig);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.96 2001/11/08 05:36:23 marka Exp $ */
/* $Id: zoneconf.c,v 1.97 2001/11/30 01:58:52 gson Exp $ */
#include <config.h>
......@@ -410,7 +410,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
obj = NULL;
result = ns_config_get(maps, "zone-statistics", &obj);
INSIST(result == ISC_R_SUCCESS);
dns_zone_setstatistics(zone, cfg_obj_asboolean(obj));
RETERR(dns_zone_setstatistics(zone, cfg_obj_asboolean(obj)));
/*
* Configure master functionality. This applies
......@@ -455,12 +455,12 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
obj = NULL;
result = ns_config_get(maps, "notify-source", &obj);
INSIST(result == ISC_R_SUCCESS);
dns_zone_setnotifysrc4(zone, cfg_obj_assockaddr(obj));
RETERR(dns_zone_setnotifysrc4(zone, cfg_obj_assockaddr(obj)));
obj = NULL;
result = ns_config_get(maps, "notify-source-v6", &obj);
INSIST(result == ISC_R_SUCCESS);
dns_zone_setnotifysrc6(zone, cfg_obj_assockaddr(obj));
RETERR(dns_zone_setnotifysrc6(zone, cfg_obj_assockaddr(obj)));
RETERR(configure_zone_acl(zconfig, vconfig, config,
"allow-transfer", ac, zone,
......@@ -596,12 +596,12 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
obj = NULL;
result = ns_config_get(maps, "transfer-source", &obj);
INSIST(result == ISC_R_SUCCESS);
dns_zone_setxfrsource4(zone, cfg_obj_assockaddr(obj));
RETERR(dns_zone_setxfrsource4(zone, cfg_obj_assockaddr(obj)));
obj = NULL;
result = ns_config_get(maps, "transfer-source-v6", &obj);
INSIST(result == ISC_R_SUCCESS);
dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj));
RETERR(dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj)));
break;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rndc.c,v 1.86 2001/11/27 04:06:13 marka Exp $ */
/* $Id: rndc.c,v 1.87 2001/11/30 01:58:55 gson Exp $ */
/*
* Principal Author: DCL
......@@ -343,7 +343,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname,
fatal("no server specified and no default");