diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-21 14:26:38 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-21 14:26:38 +1000 |
| commit | 2f5a1d2b1cfdbfc3d4c7c1e96d1ed061e7970f88 (patch) | |
| tree | 37921057be2a568b2394499b6d3b7053d7dbd364 /source4/librpc | |
| parent | f67156fc920b9a5c84c4fcaf1bf41640ddae6005 (diff) | |
| download | samba-2f5a1d2b1cfdbfc3d4c7c1e96d1ed061e7970f88.tar.gz samba-2f5a1d2b1cfdbfc3d4c7c1e96d1ed061e7970f88.tar.bz2 samba-2f5a1d2b1cfdbfc3d4c7c1e96d1ed061e7970f88.zip | |
Manually handle the NETLOGON_SAM_LOGON_REQUEST too.
With the sid structure being both optional and aligned, it was too
hard to do this in just IDL.
This requried moving some things around, as otherwise we would have a
dependency loop.
Andrew Bartlett
(This used to be commit e28790ba4884277f310be1b8bd3fba4fd47dbbdb)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/config.mk | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/nbt.idl | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index c2a8d536b2..69dafb34c6 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -332,7 +332,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT NDR_SCHANNEL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_schannel.o [SUBSYSTEM::NDR_NBT] -PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY NDR_SAMR +PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY NDR_SAMR LIBCLI_NDR_NETLOGON NDR_NBT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_nbt.o diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl index b82c19ca0b..783f04eb42 100644 --- a/source4/librpc/idl/nbt.idl +++ b/source4/librpc/idl/nbt.idl @@ -10,7 +10,7 @@ import "misc.idl", "security.idl", "svcctl.idl", "samr.idl"; [ -helper("libcli/nbt/libnbt.h") + helper("libcli/netlogon.h", "libcli/nbt/libnbt.h") ] interface nbt { @@ -391,7 +391,9 @@ interface nbt typedef bitmap samr_AcctFlags samr_AcctFlags; - typedef struct { + /* query to dc hand marshaled, as it has 'optional' + * parts */ + typedef [nopull,nopush] struct { uint16 request_count; nstring computer_name; nstring user_name; @@ -400,9 +402,12 @@ interface nbt [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size; /* The manual alignment is required because this * structure is marked flag(NDR_NOALIGN) via the - * nbt_netlogon_packet below */ - [flag(NDR_ALIGN4)] DATA_BLOB _pad; - [subcontext(0),subcontext_size(sid_size)] dom_sid0 sid; + * nbt_netlogon_packet below. + * + * However, both MUST only be present if sid_size > 0 + */ + [flag(NDR_ALIGN4)] DATA_BLOB _pad; + [subcontext(0),subcontext_size(sid_size)] dom_sid0 sid; netlogon_nt_version_flags nt_version; uint16 lmnt_token; uint16 lm20_token; |