diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2021-03-24 12:49:22 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2021-03-29 23:20:37 +0000 |
| commit | 162e6fb25ab9f61b7c1fe69c54dc5e8b17601bcf (patch) | |
| tree | 8624a0b553669694f1fdc84c1c74cb514abf512e /source4 | |
| parent | 5f4b73901175a0caedf8f5de7ffda6bb3f2f2a6c (diff) | |
| download | samba-162e6fb25ab9f61b7c1fe69c54dc5e8b17601bcf.tar.gz | |
librpc/idl: dnsp tombstone timestamp name matches MS-DNSP
MS-DNSP uses the term "EntombedTime" in e.g. "2.2.2.2.4.23 DNS_RPC_RECORD_TS"
which is more descriptive than the generic "timestamp", and less likely to be
confused with dwTimestamp, which has been our curse. Let's make it grep-able,
google-able, and evocative.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dns_server/dnsserver_common.c | 6 | ||||
| -rw-r--r-- | source4/dsdb/kcc/scavenge_dns_records.c | 4 | ||||
| -rw-r--r-- | source4/rpc_server/dnsserver/dnsdata.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c index bc0f8ad6c23..7bd6e4f64bd 100644 --- a/source4/dns_server/dnsserver_common.c +++ b/source4/dns_server/dnsserver_common.c @@ -214,7 +214,7 @@ WERROR dns_common_lookup(struct ldb_context *samdb, * a tombstone, this will be used * in dns_common_replace() */ - .data.timestamp = 1, + .data.EntombedTime = 1, }; *tombstoned = true; @@ -1008,7 +1008,7 @@ WERROR dns_common_replace(struct ldb_context *samdb, enum ndr_err_code ndr_err; if (records[i].wType == DNS_TYPE_TOMBSTONE) { - if (records[i].data.timestamp != 0) { + if (records[i].data.EntombedTime != 0) { was_tombstoned = true; } continue; @@ -1074,7 +1074,7 @@ WERROR dns_common_replace(struct ldb_context *samdb, tbs = (struct dnsp_DnssrvRpcRecord) { .wType = DNS_TYPE_TOMBSTONE, .dwSerial = serial, - .data.timestamp = timeval_to_nttime(&tv), + .data.EntombedTime = timeval_to_nttime(&tv), }; ndr_err = ndr_push_struct_blob(v, el->values, &tbs, diff --git a/source4/dsdb/kcc/scavenge_dns_records.c b/source4/dsdb/kcc/scavenge_dns_records.c index 8bcb35f079a..be4bfaa213f 100644 --- a/source4/dsdb/kcc/scavenge_dns_records.c +++ b/source4/dsdb/kcc/scavenge_dns_records.c @@ -334,7 +334,7 @@ NTSTATUS dns_tombstone_records(TALLOC_CTX *mem_ctx, t /= 3600; tombstone_struct = (struct dnsp_DnssrvRpcRecord){ - .wType = DNS_TYPE_TOMBSTONE, .data = {.timestamp = t}}; + .wType = DNS_TYPE_TOMBSTONE, .data = {.EntombedTime = t}}; true_struct = (struct ldb_val){.data = true_str, .length = 4}; @@ -453,7 +453,7 @@ NTSTATUS dns_delete_tombstones(TALLOC_CTX *mem_ctx, continue; } - if (rec->data.timestamp > tombstone_time) { + if (rec->data.EntombedTime > tombstone_time) { continue; } diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c index 31d0233cf52..ae64b9b643c 100644 --- a/source4/rpc_server/dnsserver/dnsdata.c +++ b/source4/rpc_server/dnsserver/dnsdata.c @@ -306,7 +306,7 @@ void dnsp_to_dns_copy(TALLOC_CTX *mem_ctx, struct dnsp_DnssrvRpcRecord *dnsp, switch (dnsp->wType) { case DNS_TYPE_TOMBSTONE: - dns->data.timestamp = dnsp->data.timestamp; + dns->data.EntombedTime = dnsp->data.EntombedTime; break; case DNS_TYPE_A: @@ -437,7 +437,7 @@ WERROR dns_to_dnsp_convert(TALLOC_CTX *mem_ctx, struct DNS_RPC_RECORD *dns, switch (dns->wType) { case DNS_TYPE_TOMBSTONE: - dnsp->data.timestamp = dns->data.timestamp; + dnsp->data.EntombedTime = dns->data.EntombedTime; break; case DNS_TYPE_A: |