Commit 464e3207 authored by Mark Andrews's avatar Mark Andrews

address warnings

parent 72b0326c
......@@ -414,7 +414,7 @@ ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list,
const cfg_listelt_t *element;
isc_sockaddr_t *addrs;
in_port_t port;
isc_dscp_t dscp = -1, *dscps;
isc_dscp_t dscp = -1, *dscps = NULL;
isc_result_t result;
INSIST(addrsp != NULL && *addrsp == NULL);
......@@ -916,7 +916,7 @@ ns_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) {
maps[i] = NULL;
result = ns_config_get(maps, "dscp", &dscpobj);
if (dscpobj == NULL) {
if (result != ISC_R_SUCCESS || dscpobj == NULL) {
*dscpp = -1;
return (ISC_R_SUCCESS);
}
......
......@@ -4372,7 +4372,7 @@ adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) {
dns_view_t *view;
dns_zone_t *zone, *next;
isc_sockaddr_t addr, *addrp;
isc_dscp_t dscp;
isc_dscp_t dscp = -1;
result = ns_listenlist_create(mctx, &list);
if (result != ISC_R_SUCCESS)
......@@ -4398,6 +4398,7 @@ adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) {
* query ports, and some of them may override an existing
* wildcard IPv6 port.
*/
/* XXXMPA fix dscp */
result = add_listenelt(mctx, list, &addr, dscp, ISC_TRUE);
if (result != ISC_R_SUCCESS)
goto fail;
......
......@@ -11413,7 +11413,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
if (result == ISC_R_SUCCESS)
have_xfrsource = ISC_TRUE;
result = dns_peer_gettransferdscp(peer, &dscp);
if (dscp != -1)
if (result == ISC_R_SUCCESS && dscp != -1)
have_xfrdscp = ISC_TRUE;
if (zone->view->resolver != NULL)
udpsize =
......
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