sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

finished off the ndr_sec.c module

Browse Source 
(This used to be commit 6a8f297c45)
This commit is contained in:
Andrew Tridgell 2003-11-05 00:49:42 +00:00
parent 18d7a41ace
commit eeffb71c72
2 changed files with 164 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
source4/libcli/ndr/ndr_basic.c
View File

@ -170,6 +170,21 @@ NTSTATUS ndr_push_bytes(struct ndr_push *ndr, const char *data, uint32 n)
return NT_STATUS_OK;
}
/*
save the current position
*/
void ndr_push_save(struct ndr_push *ndr, struct ndr_push_save *save)
{
save->offset = ndr->offset;
}
/*
restore the position
*/
void ndr_push_restore(struct ndr_push *ndr, struct ndr_push_save *save)
{
ndr->offset = save->offset;
}
/*
this is used when a packet has a 4 byte length field. We remember the start position
@ -178,16 +193,17 @@ NTSTATUS ndr_push_bytes(struct ndr_push *ndr, const char *data, uint32 n)
NTSTATUS ndr_push_length4_start(struct ndr_push *ndr, struct ndr_push_save *save)
{
NDR_PUSH_ALIGN(ndr, 4);
save->offset = ndr->offset;
ndr_push_save(ndr, save);
return ndr_push_u32(ndr, 0);
}
NTSTATUS ndr_push_length4_end(struct ndr_push *ndr, struct ndr_push_save *save)
{
uint32 offset = ndr->offset;
ndr->offset = save->offset;
NDR_CHECK(ndr_push_u32(ndr, offset - save->offset));
ndr->offset = offset;
struct ndr_push_save save2;
ndr_push_save(ndr, &save2);
ndr_push_restore(ndr, save);
NDR_CHECK(ndr_push_u32(ndr, save2.offset - ndr->offset));
ndr_push_restore(ndr, &save2);
return NT_STATUS_OK;
}
@ -217,3 +233,38 @@ NTSTATUS ndr_push_unistr(struct ndr_push *ndr, const char *s)
return NT_STATUS_OK;
}
/*
push a 4 byte offset pointer, remembering where we are so we can later fill
in the correct value
*/
NTSTATUS ndr_push_offset(struct ndr_push *ndr, struct ndr_push_save *ofs)
{
NDR_PUSH_ALIGN(ndr, 4);
ndr_push_save(ndr, ofs);
return ndr_push_u32(ndr, 0);
}
/*
fill in the correct offset in a saved offset pointer
the offset is taken relative to 'save'
*/
NTSTATUS ndr_push_offset_ptr(struct ndr_push *ndr,
struct ndr_push_save *ofs,
struct ndr_push_save *save)
{
struct ndr_push_save save2;
ndr_push_save(ndr, &save2);
ndr_push_restore(ndr, ofs);
NDR_CHECK(ndr_push_u32(ndr, save2.offset - save->offset));
ndr_push_restore(ndr, &save2);
return NT_STATUS_OK;
}
/*
push a GUID
*/
NTSTATUS ndr_push_guid(struct ndr_push *ndr, GUID *guid)
{
return ndr_push_bytes(ndr, guid->info, GUID_SIZE);
}

118
source4/libcli/ndr/ndr_sec.c
View File

@ -174,7 +174,7 @@ NTSTATUS ndr_pull_dom_sid_ofs(struct ndr_pull *ndr, struct dom_sid **sid)
parse a security descriptor
*/
NTSTATUS ndr_pull_security_descriptor(struct ndr_pull *ndr,
struct security_descriptor **sd)
struct security_descriptor **sd)
{
NDR_ALLOC(ndr, *sd);
@ -188,24 +188,122 @@ NTSTATUS ndr_pull_security_descriptor(struct ndr_pull *ndr,
return NT_STATUS_OK;
}
/*
parse a security_ace
*/
NTSTATUS ndr_push_security_ace(struct ndr_push *ndr, struct security_ace *ace)
{
struct ndr_push_save save1, save2;
NDR_CHECK(ndr_push_u8(ndr, ace->type));
NDR_CHECK(ndr_push_u8(ndr, ace->flags));
ndr_push_save(ndr, &save1);
NDR_CHECK(ndr_push_u16(ndr, 0));
NDR_CHECK(ndr_push_u32(ndr, ace->access_mask));
if (sec_ace_object(ace->type)) {
NDR_CHECK(ndr_push_u32(ndr, ace->obj->flags));
if (ace->obj->flags & SEC_ACE_OBJECT_PRESENT) {
NDR_CHECK(ndr_push_guid(ndr, &ace->obj->object_guid));
}
if (ace->obj->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
NDR_CHECK(ndr_push_guid(ndr, &ace->obj->inherit_guid));
}
}
NDR_CHECK(ndr_push_dom_sid(ndr, &ace->trustee));
ndr_push_save(ndr, &save2);
ndr_push_restore(ndr, &save1);
NDR_CHECK(ndr_push_u16(ndr, 2 + save2.offset - save1.offset));
ndr_push_restore(ndr, &save2);
return NT_STATUS_OK;
}
/*
push a security_acl
*/
NTSTATUS ndr_push_security_acl(struct ndr_push *ndr, struct security_acl *acl)
{
int i;
struct ndr_push_save save1, save2;
NDR_CHECK(ndr_push_u16(ndr, acl->revision));
ndr_push_save(ndr, &save1);
NDR_CHECK(ndr_push_u16(ndr, 0));
NDR_CHECK(ndr_push_u32(ndr, acl->num_aces));
for (i=0;i<acl->num_aces;i++) {
NDR_CHECK(ndr_push_security_ace(ndr, &acl->aces[i]));
}
ndr_push_save(ndr, &save2);
ndr_push_restore(ndr, &save1);
NDR_CHECK(ndr_push_u16(ndr, 2 + save2.offset - save1.offset));
ndr_push_restore(ndr, &save2);
return NT_STATUS_OK;
}
/*
push a dom_sid
*/
NTSTATUS ndr_push_dom_sid(struct ndr_push *ndr, struct dom_sid *sid)
{
int i;
NDR_CHECK(ndr_push_u8(ndr, sid->sid_rev_num));
NDR_CHECK(ndr_push_u8(ndr, sid->num_auths));
for (i=0;i<6;i++) {
NDR_CHECK(ndr_push_u8(ndr, sid->id_auth[i]));
}
for (i=0;i<sid->num_auths;i++) {
NDR_CHECK(ndr_push_u32(ndr, sid->sub_auths[i]));
}
return NT_STATUS_OK;
}
/*
generate a ndr security descriptor
*/
NTSTATUS ndr_push_security_descriptor(struct ndr_push *ndr,
struct security_descriptor *sd)
{
uint32 var_offset;
struct ndr_push_save save;
struct ndr_push_save ofs1, ofs2, ofs3, ofs4;
var_offset = 20;
ndr_push_save(ndr, &save);
NDR_CHECK(ndr_push_u8(ndr, sd->revision));
NDR_CHECK(ndr_push_u16(ndr, sd->type));
/*
NDR_CHECK(ndr_push_dom_sid_ofs(ndr, sd->owner_sid, &var_offset));
NDR_CHECK(ndr_push_dom_sid_ofs(ndr, sd->group_sid, &var_offset));
NDR_CHECK(ndr_push_security_acl_ofs(ndr, sd->sacl, &var_offset));
NDR_CHECK(ndr_push_security_acl_ofs(ndr, sd->dacl, &var_offset));
*/
NDR_CHECK(ndr_push_offset(ndr, &ofs1));
NDR_CHECK(ndr_push_offset(ndr, &ofs2));
NDR_CHECK(ndr_push_offset(ndr, &ofs3));
NDR_CHECK(ndr_push_offset(ndr, &ofs4));
if (sd->owner_sid) {
NDR_CHECK(ndr_push_offset_ptr(ndr, &ofs1, &save));
NDR_CHECK(ndr_push_dom_sid(ndr, sd->owner_sid));
}
if (sd->group_sid) {
NDR_CHECK(ndr_push_offset_ptr(ndr, &ofs2, &save));
NDR_CHECK(ndr_push_dom_sid(ndr, sd->group_sid));
}
if (sd->sacl) {
NDR_CHECK(ndr_push_offset_ptr(ndr, &ofs3, &save));
NDR_CHECK(ndr_push_security_acl(ndr, sd->sacl));
}
if (sd->dacl) {
NDR_CHECK(ndr_push_offset_ptr(ndr, &ofs4, &save));
NDR_CHECK(ndr_push_security_acl(ndr, sd->dacl));
}
return NT_STATUS_OK;
}