diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 16:26:56 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:21 +0100 |
| commit | b84be078c197f9752b53d68c882f4d1b44979b8e (patch) | |
| tree | bde019464dc96ee6c66837ab90a56ed3a9f6b837 /source4/libcli | |
| parent | fd1870e4f7370a184850e35a3d83157c664a79de (diff) | |
| download | samba-b84be078c197f9752b53d68c882f4d1b44979b8e.tar.gz samba-b84be078c197f9752b53d68c882f4d1b44979b8e.tar.bz2 samba-b84be078c197f9752b53d68c882f4d1b44979b8e.zip | |
r26309: Move specification of port higher up the all stack.
(This used to be commit 7de55cde7c7fe0141c05c8a38248667ebf3a9033)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/nbt/libnbt.h | 1 | ||||
| -rw-r--r-- | source4/libcli/nbt/namequery.c | 2 | ||||
| -rw-r--r-- | source4/libcli/resolve/nbtlist.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h index e383591089..2f7ce8d1b4 100644 --- a/source4/libcli/nbt/libnbt.h +++ b/source4/libcli/nbt/libnbt.h @@ -128,6 +128,7 @@ struct nbt_name_query { struct { struct nbt_name name; const char *dest_addr; + uint16_t dest_port; bool broadcast; bool wins_lookup; int timeout; /* in seconds */ diff --git a/source4/libcli/nbt/namequery.c b/source4/libcli/nbt/namequery.c index 755e06e880..6bc6878194 100644 --- a/source4/libcli/nbt/namequery.c +++ b/source4/libcli/nbt/namequery.c @@ -54,7 +54,7 @@ _PUBLIC_ struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nb packet->questions[0].question_class = NBT_QCLASS_IP; dest = socket_address_from_strings(packet, nbtsock->sock->backend_name, - io->in.dest_addr, lp_nbt_port(global_loadparm)); + io->in.dest_addr, io->in.dest_port); if (dest == NULL) goto failed; req = nbt_name_request_send(nbtsock, dest, packet, io->in.timeout, io->in.retries, false); diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c index baf3874aa4..13010eec3e 100644 --- a/source4/libcli/resolve/nbtlist.c +++ b/source4/libcli/resolve/nbtlist.c @@ -151,6 +151,7 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx, for (i=0;i<state->num_queries;i++) { state->io_queries[i].in.name = state->name; state->io_queries[i].in.dest_addr = talloc_strdup(state->io_queries, address_list[i]); + state->io_queries[i].in.dest_port = lp_nbt_port(global_loadparm); if (composite_nomem(state->io_queries[i].in.dest_addr, c)) return c; state->io_queries[i].in.broadcast = broadcast; |