summaryrefslogtreecommitdiff
path: root/source3/rpc_parse
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-09-17 20:28:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:51:59 -0500
commitb5fabe4cf89cf19be21ae6efcb877f556749b1bc (patch)
tree60761859ee4a0878142ef159a5a7b593035ab481 /source3/rpc_parse
parent8bf6d571764f67603bd120dc06e38b53c69cf320 (diff)
downloadsamba-b5fabe4cf89cf19be21ae6efcb877f556749b1bc.tar.gz
samba-b5fabe4cf89cf19be21ae6efcb877f556749b1bc.tar.bz2
samba-b5fabe4cf89cf19be21ae6efcb877f556749b1bc.zip
r18598: Add marshalling support to smb_io_time.
Volker (This used to be commit 2ab0ab326210a6e2b23a15c0cfc8f21ac2fcceac)
Diffstat (limited to 'source3/rpc_parse')
-rw-r--r--source3/rpc_parse/parse_misc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index ef4d0e7689..cd2aabd056 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -124,13 +124,20 @@ BOOL smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth)
if(!prs_align(ps))
return False;
+
+ if (MARSHALLING(ps)) {
+ low = *nttime & 0xFFFFFFFF;
+ high = *nttime >> 32;
+ }
if(!prs_uint32("low ", ps, depth, &low)) /* low part */
return False;
if(!prs_uint32("high", ps, depth, &high)) /* high part */
return False;
- *nttime = (((uint64_t)high << 32) + low);
+ if (UNMARSHALLING(ps)) {
+ *nttime = (((uint64_t)high << 32) + low);
+ }
return True;
}