sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

dns: Add a SOA record to error replies

Browse Source 
Signed-off-by: Kai Blin <kai@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Kai Blin 2014-10-29 13:41:53 +01:00
parent bda1a7320f
commit d9a3f19749
1 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source4/dns_server/dns_query.c
View File

@ -253,6 +253,52 @@ static WERROR ask_forwarder_recv(
return WERR_OK;
}
static WERROR add_zone_authority_record(struct dns_server *dns,
TALLOC_CTX *mem_ctx,
const struct dns_name_question *question,
struct dns_res_rec **nsrecs, uint16_t *nscount)
{
const char *zone = NULL;
struct dnsp_DnssrvRpcRecord *recs;
struct dns_res_rec *ns = *nsrecs;
uint16_t rec_count, ni = *nscount;
struct ldb_dn *dn = NULL;
unsigned int ri;
WERROR werror;
zone = dns_get_authoritative_zone(dns, question->name);
DEBUG(10, ("Creating zone authority record for '%s'\n", zone));
werror = dns_name2dn(dns, mem_ctx, zone, &dn);
if (!W_ERROR_IS_OK(werror)) {
return werror;
}
werror = dns_lookup_records(dns, mem_ctx, dn, &recs, &rec_count);
if (!W_ERROR_IS_OK(werror)) {
return werror;
}
ns = talloc_realloc(mem_ctx, ns, struct dns_res_rec, rec_count + ni);
if (ns == NULL) {
return WERR_NOMEM;
}
for (ri = 0; ri < rec_count; ri++) {
if (recs[ri].wType == DNS_TYPE_SOA) {
werror = create_response_rr(zone, &recs[ri], &ns, &ni);
if (!W_ERROR_IS_OK(werror)) {
return werror;
}
}
}
*nscount = ni;
*nsrecs = ns;
return WERR_OK;
}
static WERROR handle_question(struct dns_server *dns,
TALLOC_CTX *mem_ctx,
const struct dns_name_question *question,
@ -271,7 +317,11 @@ static WERROR handle_question(struct dns_server *dns,
W_ERROR_NOT_OK_RETURN(werror);
werror = dns_lookup_records(dns, mem_ctx, dn, &recs, &rec_count);
W_ERROR_NOT_OK_RETURN(werror);
if (!W_ERROR_IS_OK(werror)) {
werror_return = werror;
add_zone_authority_record(dns, mem_ctx, question, &ns, &ni);
goto done;
}
ans = talloc_realloc(mem_ctx, ans, struct dns_res_rec, rec_count + ai);
if (ans == NULL) {