diff options
| -rw-r--r-- | source4/build/pidl/util.pm | 2 | ||||
| -rw-r--r-- | source4/include/smb.h | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 30 |
3 files changed, 32 insertions, 2 deletions
diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm index bddce57740..4f4a0d8b6e 100644 --- a/source4/build/pidl/util.pm +++ b/source4/build/pidl/util.pm @@ -207,7 +207,7 @@ sub is_scalar_type($) if ($type =~ /^u?int\d+/) { return 1; } - if ($type =~ /char|short|long|NTTIME| + if ($type =~ /char|short|long|NTTIME|NTTIME_1sec| time_t|error_status_t|boolean32|unsigned32| HYPER_T|wchar_t|DATA_BLOB|WERROR/x) { return 1; diff --git a/source4/include/smb.h b/source4/include/smb.h index c70ab81611..1fc43fd2f3 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -215,6 +215,8 @@ typedef struct data_blob { /* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30 */ typedef uint64_t NTTIME; +/* 64 bit time (1 sec) 1601 - in the NDR blob but mapped to NTTIME */ +#define NTTIME_1sec NTTIME /* 8 byte aligned 'hyper' type from MS IDL */ typedef uint64_t HYPER_T; diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index 057b162ca9..f26c40e7b7 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -951,6 +951,26 @@ NTSTATUS ndr_pull_NTTIME(struct ndr_pull *ndr, NTTIME *t) } /* + push a NTTIME +*/ +NTSTATUS ndr_push_NTTIME_1sec(struct ndr_push *ndr, NTTIME t) +{ + t /= 10000000; + NDR_CHECK(ndr_push_uint64(ndr, t)); + return NT_STATUS_OK; +} + +/* + pull a NTTIME +*/ +NTSTATUS ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, NTTIME *t) +{ + NDR_CHECK(ndr_pull_uint64(ndr, t)); + (*t) *= 10000000; + return NT_STATUS_OK; +} + +/* push a time_t */ NTSTATUS ndr_push_time_t(struct ndr_push *ndr, time_t t) @@ -997,7 +1017,10 @@ void ndr_print_int32(struct ndr_print *ndr, const char *name, int32_t v) void ndr_print_uint64(struct ndr_print *ndr, const char *name, uint64_t v) { - ndr->print(ndr, "%-25s: 0x%08x%08x", name, (uint32_t)(v >> 32), (uint32_t)(v & 0xFFFFFFFF)); + ndr->print(ndr, "%-25s: 0x%08x%08x (%llu)", name, + (uint32_t)(v >> 32), + (uint32_t)(v & 0xFFFFFFFF), + v); } void ndr_print_int64(struct ndr_print *ndr, const char *name, int64_t v) @@ -1036,6 +1059,11 @@ void ndr_print_NTTIME(struct ndr_print *ndr, const char *name, NTTIME t) ndr->print(ndr, "%-25s: %s", name, nt_time_string(ndr, t)); } +void ndr_print_NTTIME_1sec(struct ndr_print *ndr, const char *name, NTTIME t) +{ + ndr_print_NTTIME(ndr, name, t); +} + void ndr_print_time_t(struct ndr_print *ndr, const char *name, time_t t) { if (t == (time_t)-1 || t == 0) { |