diff options
Diffstat (limited to 'source4/dns_server')
-rw-r--r-- | source4/dns_server/dns_query.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c index b75fabe7e82..762bcca6fb6 100644 --- a/source4/dns_server/dns_query.c +++ b/source4/dns_server/dns_query.c @@ -645,20 +645,12 @@ static void handle_authoritative_done(struct tevent_req *subreq) static WERROR handle_authoritative_recv(struct tevent_req *req) { - struct handle_authoritative_state *state = tevent_req_data( - req, struct handle_authoritative_state); WERROR werr; if (tevent_req_is_werror(req, &werr)) { return werr; } - werr = add_zone_authority_record(state->dns, state, state->question, - state->nsrecs); - if (!W_ERROR_IS_OK(werr)) { - return werr; - } - return WERR_OK; } @@ -1091,6 +1083,7 @@ static void dns_server_process_query_got_auth(struct tevent_req *subreq) struct dns_server_process_query_state *state = tevent_req_data( req, struct dns_server_process_query_state); WERROR werr; + WERROR werr2; werr = handle_authoritative_recv(subreq); TALLOC_FREE(subreq); @@ -1103,6 +1096,20 @@ static void dns_server_process_query_got_auth(struct tevent_req *subreq) /* If you have run out of forwarders, simply finish */ if (state->forwarders == NULL) { + werr2 = add_zone_authority_record(state->dns, + state, + state->question, + &state->nsrecs); + if (tevent_req_werror(req, werr2)) { + DBG_WARNING("Failed to add SOA record: %s\n", + win_errstr(werr2)); + return; + } + + state->ancount = talloc_array_length(state->answers); + state->nscount = talloc_array_length(state->nsrecs); + state->arcount = talloc_array_length(state->additional); + tevent_req_werror(req, werr); return; } @@ -1125,6 +1132,16 @@ static void dns_server_process_query_got_auth(struct tevent_req *subreq) return; } + werr2 = add_zone_authority_record(state->dns, + state, + state->question, + &state->nsrecs); + if (tevent_req_werror(req, werr2)) { + DBG_WARNING("Failed to add SOA record: %s\n", + win_errstr(werr2)); + return; + } + state->ancount = talloc_array_length(state->answers); state->nscount = talloc_array_length(state->nsrecs); state->arcount = talloc_array_length(state->additional); |