diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-20 11:54:50 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-20 11:54:50 +1000 |
| commit | aa90730e0c2617c3d2ab477c3f08c26adb582b21 (patch) | |
| tree | a909e5ebc0df0d664ef0c537330fb1524a7086ca /source4/nbt_server/dgram | |
| parent | e533e7a7ebc8b3029cf604e63cdc6d1cf8570ccd (diff) | |
| download | samba-aa90730e0c2617c3d2ab477c3f08c26adb582b21.tar.gz samba-aa90730e0c2617c3d2ab477c3f08c26adb582b21.tar.bz2 samba-aa90730e0c2617c3d2ab477c3f08c26adb582b21.zip | |
Revert addition of 'mailslot' parameter.
It turns out that the mailslot name (and a useful private prointer) is
provided in the struct dgram_mailslot_handler.
Andrew Bartlett
(This used to be commit e17804b8857fdb3c182c5e886323b9d6c194c2ff)
Diffstat (limited to 'source4/nbt_server/dgram')
| -rw-r--r-- | source4/nbt_server/dgram/browse.c | 1 | ||||
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source4/nbt_server/dgram/browse.c b/source4/nbt_server/dgram/browse.c index 36f0160e1b..2e12fa114a 100644 --- a/source4/nbt_server/dgram/browse.c +++ b/source4/nbt_server/dgram/browse.c @@ -49,7 +49,6 @@ static const char *nbt_browse_opcode_string(enum nbt_browse_opcode r) */ void nbtd_mailslot_browse_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const char *mailslot_name, struct socket_address *src) { struct nbt_browse_packet *browse = talloc(dgmslot, struct nbt_browse_packet); diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index c66089523b..b8fb1b8677 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -38,7 +38,6 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, struct nbtd_interface *iface, struct nbt_dgram_packet *packet, - const char *mailslot_name, const struct socket_address *src, struct nbt_netlogon_packet *netlogon) { @@ -106,7 +105,6 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot, struct nbtd_interface *iface, struct nbt_dgram_packet *packet, - const char *mailslot_name, const struct socket_address *src, struct nbt_netlogon_packet *netlogon) { @@ -135,7 +133,7 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot, } if (netlogon->req.logon.sid_size) { - if (strcasecmp(mailslot_name, NBT_MAILSLOT_NTLOGON) == 0) { + 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; @@ -171,7 +169,6 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot, */ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const char *mailslot_name, struct socket_address *src) { NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -200,11 +197,11 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, switch (netlogon->command) { case LOGON_PRIMARY_QUERY: - nbtd_netlogon_getdc(dgmslot, iface, packet, mailslot_name, + nbtd_netlogon_getdc(dgmslot, iface, packet, src, netlogon); break; case LOGON_SAM_LOGON_REQUEST: - nbtd_netlogon_samlogon(dgmslot, iface, packet, mailslot_name, + nbtd_netlogon_samlogon(dgmslot, iface, packet, src, netlogon); break; default: |