diff options
| author | Tim Potter <tpot@samba.org> | 2001-11-30 01:04:15 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2001-11-30 01:04:15 +0000 |
| commit | 6d9adfe73c04132ff162d05b0c309395c4a54485 (patch) | |
| tree | b30d174cbbf7f9eaf4eb26108cc64bbdf2c01daa /source3/rpc_parse | |
| parent | 0d5f30fe5f8f37f1673a5adc9e6ce375a969016c (diff) | |
| download | samba-6d9adfe73c04132ff162d05b0c309395c4a54485.tar.gz samba-6d9adfe73c04132ff162d05b0c309395c4a54485.tar.bz2 samba-6d9adfe73c04132ff162d05b0c309395c4a54485.zip | |
Renamed sid field in SEC_ACE to trustee to be more in line with MS's
definitions.
(This used to be commit 9712d3f15a47155f558d0034ef71fd06afb11301)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_sec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c index 98f076c1e3..0e6f9e2879 100644 --- a/source3/rpc_parse/parse_sec.c +++ b/source3/rpc_parse/parse_sec.c @@ -68,8 +68,8 @@ void init_sec_ace(SEC_ACE *t, DOM_SID *sid, uint8 type, SEC_ACCESS mask, uint8 f t->size = sid_size(sid) + 8; t->info = mask; - ZERO_STRUCTP(&t->sid); - sid_copy(&t->sid, sid); + ZERO_STRUCTP(&t->trustee); + sid_copy(&t->trustee, sid); } /******************************************************************* @@ -107,7 +107,7 @@ BOOL sec_io_ace(char *desc, SEC_ACE *psa, prs_struct *ps, int depth) if(!prs_align(ps)) return False; - if(!smb_io_dom_sid("sid ", &psa->sid , ps, depth)) + if(!smb_io_dom_sid("trustee ", &psa->trustee , ps, depth)) return False; if(!prs_uint16_post("size ", ps, depth, &psa->size, offset_ace_size, old_offset)) @@ -281,7 +281,7 @@ BOOL sec_ace_equal(SEC_ACE *s1, SEC_ACE *s2) /* Check SID */ - if (!sid_equal(&s1->sid, &s2->sid)) { + if (!sid_equal(&s1->trustee, &s2->trustee)) { return False; } |