From bcb3a669df3d0f8295a35cf1d66c377b64b7dede Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 30 Jul 2014 18:53:44 +1000 Subject: [PATCH 1/2] s4-rpc: dnsserver: Correctly set rank for glue NS records Signed-off-by: Amitay Isaacs --- source4/rpc_server/dnsserver/dnsdb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source4/rpc_server/dnsserver/dnsdb.c b/source4/rpc_server/dnsserver/dnsdb.c index 8cdeae4..24e9e89 100644 --- a/source4/rpc_server/dnsserver/dnsdb.c +++ b/source4/rpc_server/dnsserver/dnsdb.c @@ -408,10 +408,13 @@ WERROR dnsserver_db_add_record(TALLOC_CTX *mem_ctx, rec = dns_to_dnsp_copy(mem_ctx, add_record); W_ERROR_HAVE_NO_MEMORY(rec); - /* Set the correct rank for the record. - * FIXME: add logic to check for glue records */ + /* Set the correct rank for the record. */ if (z->zoneinfo->dwZoneType == DNS_ZONE_TYPE_PRIMARY) { - rec->rank |= DNS_RANK_ZONE; + if (strcmp(name, "@") != 0 && rec->wType == DNS_TYPE_NS) { + rec->rank = DNS_RANK_NS_GLUE; + } else { + rec->rank |= DNS_RANK_ZONE; + } } else if (strcmp(z->name, ".") == 0) { rec->rank |= DNS_RANK_ROOT_HINT; } -- 1.9.3 From 7cde4b01851bc670fe167671aa179c5568c43618 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 30 Jul 2014 19:57:42 +1000 Subject: [PATCH 2/2] s4-rpc: dnsserver: Do not return NS_GLUE records with VIEW_GLUE_DATA filter Signed-off-by: Amitay Isaacs --- source4/rpc_server/dnsserver/dnsdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c index fb2547f..4866006 100644 --- a/source4/rpc_server/dnsserver/dnsdata.c +++ b/source4/rpc_server/dnsserver/dnsdata.c @@ -806,7 +806,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx, } } if (select_flag & DNS_RPC_VIEW_GLUE_DATA) { - if (dnsp_rec.rank == DNS_RANK_NS_GLUE) { + if (dnsp_rec.rank == DNS_RANK_GLUE) { found = true; } } -- 1.9.3