diff options
| author | Jeremy Allison <jra@samba.org> | 2008-04-17 09:25:45 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-04-17 09:25:45 -0700 |
| commit | 78d88cbaeb21915ffdba45f1844cfd2a8534c874 (patch) | |
| tree | 5ceb07b818ff30cbd02f8c5ef7f842864595950a /source3/librpc | |
| parent | 4939a24cbc751719b008bdd474181fffabd33934 (diff) | |
| parent | 5c29bc8931d025de4ec91247be04da4388642727 (diff) | |
| download | samba-78d88cbaeb21915ffdba45f1844cfd2a8534c874.tar.gz samba-78d88cbaeb21915ffdba45f1844cfd2a8534c874.tar.bz2 samba-78d88cbaeb21915ffdba45f1844cfd2a8534c874.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit d665cecd8b1b40ad30ec435de0bd925cdea24795)
Diffstat (limited to 'source3/librpc')
| -rw-r--r-- | source3/librpc/idl/nbt.idl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/librpc/idl/nbt.idl b/source3/librpc/idl/nbt.idl index ca764d2a2b..e5efe1746d 100644 --- a/source3/librpc/idl/nbt.idl +++ b/source3/librpc/idl/nbt.idl @@ -440,9 +440,8 @@ interface nbt nstring unicode_domain; uint32 db_count; nbt_db_change dbchange[db_count]; - [value(ndr_size_dom_sid(&sid, ndr->flags))] uint32 sid_size; - [flag(NDR_ALIGN4)] DATA_BLOB _pad2; - dom_sid sid; + [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size; + [subcontext(0),subcontext_size(sid_size)] dom_sid0 sid; uint32 nt_version; uint16 lmnt_token; uint16 lm20_token; @@ -560,9 +559,8 @@ interface nbt nstring user_name; astring mailslot_name; uint32 acct_control; - [value(ndr_size_dom_sid(&sid, ndr->flags))] uint32 sid_size; - [flag(NDR_ALIGN4)] DATA_BLOB _pad; - dom_sid sid; + [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size; + [subcontext(0),subcontext_size(sid_size)] dom_sid0 sid; uint32 nt_version; uint16 lmnt_token; uint16 lm20_token; |