diff options
| author | Jim McDonough <jmcd@samba.org> | 2003-10-17 19:47:06 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2003-10-17 19:47:06 +0000 |
| commit | e6900132ca7d216662e3ab08ad37a1e34c752cd9 (patch) | |
| tree | 46a629745ce814e3de5a6dd49536ad86ab34b6ab | |
| parent | 1b259ab003430bc38234c893f2fbbfb30cc7afa0 (diff) | |
| download | samba-e6900132ca7d216662e3ab08ad37a1e34c752cd9.tar.gz samba-e6900132ca7d216662e3ab08ad37a1e34c752cd9.tar.bz2 samba-e6900132ca7d216662e3ab08ad37a1e34c752cd9.zip | |
uuid itself might not be aligned (as is the case in epm map requests), so
it needs to be aligned outside the smb_io_rpc_uuid() call if a specific
rpc or struct needs it that way.
(This used to be commit e9fc15d58c52c12438c1f9c69394c11f76ce72d8)
| -rw-r--r-- | source3/rpc_parse/parse_rpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c index 57ebe5d356..f053297192 100644 --- a/source3/rpc_parse/parse_rpc.c +++ b/source3/rpc_parse/parse_rpc.c @@ -264,9 +264,6 @@ BOOL smb_io_rpc_uuid(const char *desc, RPC_UUID *uuid, prs_struct *ps, int depth prs_debug(ps, depth, desc, "smb_io_rpc_uuid"); depth++; - if(!prs_align(ps)) - return False; - if(!prs_uint32 ("data ", ps, depth, &uuid->time_low)) return False; if(!prs_uint16 ("data ", ps, depth, &uuid->time_mid)) @@ -292,6 +289,9 @@ static BOOL smb_io_rpc_iface(const char *desc, RPC_IFACE *ifc, prs_struct *ps, i prs_debug(ps, depth, desc, "smb_io_rpc_iface"); depth++; + if (!prs_align(ps)) + return False; + if (!smb_io_rpc_uuid( "uuid", &ifc->uuid, ps, depth)) return False; |