From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 24 Mar 2021 00:36:18 +0000 (+1300)
Subject: rpc/idl dnsserver s/DNS_RPC_DATA/DNS_RPC_RECORD_DATA/
X-Git-Tag: tevent-0.11.0~1353
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1c47d0c83091763be5231792e4e089b5d5365dd;p=thirdparty%2Fsamba.git

rpc/idl dnsserver s/DNS_RPC_DATA/DNS_RPC_RECORD_DATA/

Following MS-DNSP.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Mar 30 00:20:53 UTC 2021 on sn-devel-184
---

diff --git a/librpc/idl/dnsserver.idl b/librpc/idl/dnsserver.idl
index 59d0a7d358a..a6c413a9d68 100644
--- a/librpc/idl/dnsserver.idl
+++ b/librpc/idl/dnsserver.idl
@@ -136,22 +136,22 @@ import "misc.idl", "dnsp.idl";
 		[case(DNS_TYPE_SRV)]   				DNS_RPC_RECORD_SRV srv;
 		[case(DNS_TYPE_DNAME)] 				DNS_RPC_NAME name;
 	}
-	DNS_RPC_DATA;
+	DNS_RPC_RECORD_DATA;
 
 	typedef [public] struct {
-		[value(ndr_size_DNS_RPC_DATA(&data,wType,0))] uint16 wDataLength;
+		[value(ndr_size_DNS_RPC_RECORD_DATA(&data,wType,0))] uint16 wDataLength;
 		dns_record_type        wType;
 		DWORD       dwFlags;
 		DWORD       dwSerial;
 		DWORD       dwTtlSeconds;
 		DWORD       dwTimeStamp;
 		DWORD       dwReserved;
-		[subcontext(0),subcontext_size(wDataLength),switch_is(wType)] DNS_RPC_DATA data;
+		[subcontext(0),subcontext_size(wDataLength),switch_is(wType)] DNS_RPC_RECORD_DATA data;
 	}
 	DNS_RPC_RECORD;
 
 	typedef struct {
-		[value(ndr_size_DNS_RPC_DATA(&rec.data,rec.wType,0))] uint3264 wContextLength;
+		[value(ndr_size_DNS_RPC_RECORD_DATA(&rec.data,rec.wType,0))] uint3264 wContextLength;
 		DNS_RPC_RECORD rec;
 	}
 	DNS_RPC_RECORD_BUF;
diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index ae64b9b643c..c3787bc9dfe 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -406,7 +406,7 @@ void dnsp_to_dns_copy(TALLOC_CTX *mem_ctx, struct dnsp_DnssrvRpcRecord *dnsp,
 		break;
 
 	default:
-		memcpy(&dns->data, &dnsp->data, sizeof(union DNS_RPC_DATA));
+		memcpy(&dns->data, &dnsp->data, sizeof(union DNS_RPC_RECORD_DATA));
 		DEBUG(0, ("dnsserver: Found Unhandled DNS record type=%d", dnsp->wType));
 	}