From b9b964a360b3319a2170bf3ed8ca94190195a691 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 23 Sep 2006 18:24:03 +0000 Subject: r18846: Fix the same bug Volker noticed when marshalling/unmarshalling SEC_ACE. "type" is also an enum that may be any size. Treat as a uint8. Jeremy. (This used to be commit fd97f48ba38cb6a737302dac5cf23239ce7059cc) --- source3/rpc_parse/parse_sec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source3/rpc_parse/parse_sec.c') diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c index be789b2ef5..bc33062264 100644 --- a/source3/rpc_parse/parse_sec.c +++ b/source3/rpc_parse/parse_sec.c @@ -53,6 +53,7 @@ BOOL sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps, int depth) { uint32 old_offset; uint32 offset_ace_size; + uint8 type; if (psa == NULL) return False; @@ -62,9 +63,17 @@ BOOL sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps, int depth) old_offset = prs_offset(ps); - if(!prs_uint8("type ", ps, depth, (uint8*)&psa->type)) + if (MARSHALLING(ps)) { + type = (uint8)psa->type; + } + + if(!prs_uint8("type ", ps, depth, &type)) return False; + if (UNMARSHALLING(ps)) { + psa->type = (enum security_ace_type)type; + } + if(!prs_uint8("flags", ps, depth, &psa->flags)) return False; -- cgit