diff options
| -rw-r--r-- | source4/librpc/idl/nbt.idl | 5 | ||||
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl index e6af2cd035..b82c19ca0b 100644 --- a/source4/librpc/idl/nbt.idl +++ b/source4/librpc/idl/nbt.idl @@ -398,7 +398,10 @@ interface nbt astring mailslot_name; samr_AcctFlags acct_control; [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size; - /* Must not be present (ie, zero size, in request to \MAILSLOT\NET\NTLOGON */ + /* 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; netlogon_nt_version_flags nt_version; uint16 lmnt_token; diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index b8fb1b8677..664cd56636 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -133,11 +133,6 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot, } if (netlogon->req.logon.sid_size) { - if (strcasecmp(dgmslot->mailslot_name, NBT_MAILSLOT_NTLOGON) == 0) { - DEBUG(2,("NBT netlogon query failed because SID specified in request to NTLOGON\n")); - /* SID not permitted on NTLOGON (for some reason...) */ - return; - } sid = &netlogon->req.logon.sid; } else { sid = NULL; |