sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-10 13:57:47 +03:00
Code

sync with the sec_desc parsing fix from APP_HEAD. I will probably need

Browse Source 
to revisit this some.
(This used to be commit f471c880db8562231f2d6623124d3e9c31559f4c)
This commit is contained in:
Gerald Carter 2002-06-24 23:04:41 +00:00
parent 96c00daefa
commit 9d6301dfe0
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/rpc_parse/parse_sec.c
View File

@ -365,17 +365,19 @@ size_t sec_desc_size(SEC_DESC *psd)
offset = SEC_DESC_HEADER_SIZE; offset = SEC_DESC_HEADER_SIZE;
/* don't align */
if (psd->owner_sid != NULL) if (psd->owner_sid != NULL)
offset += ((sid_size(psd->owner_sid) + 3) & ~3); offset += sid_size(psd->owner_sid);
if (psd->grp_sid != NULL) if (psd->grp_sid != NULL)
offset += ((sid_size(psd->grp_sid) + 3) & ~3); offset += sid_size(psd->grp_sid);
if (psd->sacl != NULL) if (psd->sacl != NULL)
offset += ((psd->sacl->size + 3) & ~3); offset += psd->sacl->size;
if (psd->dacl != NULL) if (psd->dacl != NULL)
offset += ((psd->dacl->size + 3) & ~3); offset += psd->dacl->size;
return offset; return offset;
} }
@ -643,7 +645,7 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision,
if (offset == 0) if (offset == 0)
offset = SEC_DESC_HEADER_SIZE; offset = SEC_DESC_HEADER_SIZE;
offset += ((sid_size(dst->owner_sid) + 3) & ~3); offset += sid_size(dst->owner_sid);
} }
if (dst->grp_sid != NULL) { if (dst->grp_sid != NULL) {
@ -651,7 +653,7 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision,
if (offset == 0) if (offset == 0)
offset = SEC_DESC_HEADER_SIZE; offset = SEC_DESC_HEADER_SIZE;
offset += ((sid_size(dst->grp_sid) + 3) & ~3); offset += sid_size(dst->grp_sid);
} }
if (dst->sacl != NULL) { if (dst->sacl != NULL) {
@ -659,7 +661,7 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision,
offset_acl = SEC_DESC_HEADER_SIZE; offset_acl = SEC_DESC_HEADER_SIZE;
dst->off_sacl = offset_acl; dst->off_sacl = offset_acl;
offset_acl += ((dst->sacl->size + 3) & ~3); offset_acl += dst->sacl->size;
offset += dst->sacl->size; offset += dst->sacl->size;
offset_sid += dst->sacl->size; offset_sid += dst->sacl->size;
} }
@ -670,7 +672,7 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision,
offset_acl = SEC_DESC_HEADER_SIZE; offset_acl = SEC_DESC_HEADER_SIZE;
dst->off_dacl = offset_acl; dst->off_dacl = offset_acl;
offset_acl += ((dst->dacl->size + 3) & ~3); offset_acl += dst->dacl->size;
offset += dst->dacl->size; offset += dst->dacl->size;
offset_sid += dst->dacl->size; offset_sid += dst->dacl->size;
} }
@ -752,7 +754,7 @@ BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
prs_debug(ps, depth, desc, "sec_io_desc"); prs_debug(ps, depth, desc, "sec_io_desc");
depth++; depth++;
#if 0 /* JERRY */ #if 0
/* /*
* if alignment is needed, should be done by the the * if alignment is needed, should be done by the the
* caller. Not here. This caused me problems when marshalling * caller. Not here. This caused me problems when marshalling
@ -823,9 +825,6 @@ BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
if(!smb_io_dom_sid("grp_sid", psd->grp_sid, ps, depth)) if(!smb_io_dom_sid("grp_sid", psd->grp_sid, ps, depth))
return False; return False;
if(!prs_align(ps))
return False;
ps->data_offset = tmp_offset; ps->data_offset = tmp_offset;
} }
@ -836,8 +835,6 @@ BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
return False; return False;
if(!sec_io_acl("sacl", &psd->sacl, ps, depth)) if(!sec_io_acl("sacl", &psd->sacl, ps, depth))
return False; return False;
if(!prs_align(ps))
return False;
} }
max_offset = MAX(max_offset, prs_offset(ps)); max_offset = MAX(max_offset, prs_offset(ps));
@ -847,8 +844,6 @@ BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
return False; return False;
if(!sec_io_acl("dacl", &psd->dacl, ps, depth)) if(!sec_io_acl("dacl", &psd->dacl, ps, depth))
return False; return False;
if(!prs_align(ps))
return False;
} }
max_offset = MAX(max_offset, prs_offset(ps)); max_offset = MAX(max_offset, prs_offset(ps));