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 59d0a7d358a53db6a4f7162a312056e5fa23976f..a6c413a9d68193891a6ef67e181e474f4fcfd168 100644 (file)
--- 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 ae64b9b643ce45e80ed09ed2080c01f6e2babc01..c3787bc9dfe984b556051ccbdf1d3f37a54e5cd9 100644 (file)
--- 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));
        }