sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r18845: Fix a type-punned warning that turned out to be a real bug: The secdesc

Browse Source 
revision is now an enum that might be represented as anything, in particular
as an int. It's definitely not a uint16 :-)

Volker
(This used to be commit 7c5d66c971)
This commit is contained in:
Volker Lendecke 2006-09-23 17:59:52 +00:00 committed by Gerald (Jerry) Carter
parent 61761288e9
commit 35a8521501
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/rpc_parse/parse_sec.c
View File

@ -128,6 +128,7 @@ BOOL sec_io_acl(const char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth)
uint32 old_offset;
uint32 offset_acl_size;
SEC_ACL *psa;
uint16 revision;
/*
* Note that the size is always a multiple of 4 bytes due to the
@ -155,9 +156,17 @@ BOOL sec_io_acl(const char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth)
old_offset = prs_offset(ps);
if(!prs_uint16("revision", ps, depth, (uint16 *)&psa->revision))
if (MARSHALLING(ps)) {
revision = (uint16)psa->revision;
}
if(!prs_uint16("revision", ps, depth, &revision))
return False;
if (UNMARSHALLING(ps)) {
psa->revision = (enum security_acl_revision)revision;
}
if(!prs_uint16_pre("size ", ps, depth, &psa->size, &offset_acl_size))
return False;
@ -212,6 +221,7 @@ BOOL sec_io_desc(const char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
uint32 max_offset = 0; /* after we're done, move offset to end */
uint32 tmp_offset = 0;
uint32 off_sacl, off_dacl, off_owner_sid, off_grp_sid;
uint16 revision;
SEC_DESC *psd;
@ -237,9 +247,17 @@ BOOL sec_io_desc(const char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
/* start of security descriptor stored for back-calc offset purposes */
old_offset = prs_offset(ps);
if(!prs_uint16("revision ", ps, depth, (uint16*)&psd->revision))
if (MARSHALLING(ps)) {
revision = (uint16)psd->revision;
}
if(!prs_uint16("revision", ps, depth, &revision))
return False;
if (UNMARSHALLING(ps)) {
psd->revision = (enum security_acl_revision)revision;
}
if(!prs_uint16("type ", ps, depth, &psd->type))
return False;