diff options
| author | Volker Lendecke <vl@samba.org> | 2018-02-17 17:33:32 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-02-27 09:14:18 +0100 |
| commit | 5f9a0903a2ddc10aab4c7f07387ed53d728089c7 (patch) | |
| tree | 855de39d2f58b92e885be2ef01b7cad8e321c415 | |
| parent | 33991e5c9086d5d437d1d408be1b54cb55333856 (diff) | |
| download | samba-5f9a0903a2ddc10aab4c7f07387ed53d728089c7.tar.gz | |
nbt_server: nbtd_netlogon_samlogon needs the dst_name, not the packet
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index 36a214bdcf8..d37f914fa68 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -107,20 +107,20 @@ static NTSTATUS nbtd_netlogon_getdc(struct nbtd_server *nbtsrv, */ static NTSTATUS nbtd_netlogon_samlogon( struct nbtd_server *nbtsrv, - struct nbt_dgram_packet *packet, + struct nbt_name *dst_name, const struct socket_address *src, struct nbt_netlogon_packet *netlogon, TALLOC_CTX *mem_ctx, struct nbt_netlogon_response **presponse) { - struct nbt_name *name = &packet->data.msg.dest_name; struct ldb_context *samctx; struct dom_sid *sid; struct nbt_netlogon_response *response; NTSTATUS status; /* only answer getdc requests on the PDC or LOGON names */ - if (name->type != NBT_NAME_PDC && name->type != NBT_NAME_LOGON) { + if ((dst_name->type != NBT_NAME_PDC) && + (dst_name->type != NBT_NAME_LOGON)) { return NT_STATUS_NOT_SUPPORTED; } @@ -139,14 +139,16 @@ static NTSTATUS nbtd_netlogon_samlogon( response->response_type = NETLOGON_SAMLOGON; status = fill_netlogon_samlogon_response( - samctx, response, NULL, name->name, sid, NULL, + samctx, response, NULL, dst_name->name, sid, NULL, netlogon->req.logon.user_name, netlogon->req.logon.acct_control, src->addr, netlogon->req.logon.nt_version, nbtsrv->task->lp_ctx, &response->data.samlogon, false); if (!NT_STATUS_IS_OK(status)) { - DEBUG(2,("NBT netlogon query failed domain=%s sid=%s version=%d - %s\n", - name->name, dom_sid_string(packet, sid), netlogon->req.logon.nt_version, nt_errstr(status))); + DBG_NOTICE("NBT netlogon query failed domain=%s sid=%s " + "version=%d - %s\n", dst_name->name, + dom_sid_string(response, sid), + netlogon->req.logon.nt_version, nt_errstr(status)); TALLOC_FREE(response); return status; } @@ -205,8 +207,9 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, netlogon, netlogon, &response); break; case LOGON_SAM_LOGON_REQUEST: - status = nbtd_netlogon_samlogon(iface->nbtsrv, packet, src, - netlogon, netlogon, &response); + status = nbtd_netlogon_samlogon( + iface->nbtsrv, &packet->data.msg.dest_name, src, + netlogon, netlogon, &response); break; default: DEBUG(2,("unknown netlogon op %d from %s:%d\n", |