diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 16:20:29 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:46:59 +0100 |
| commit | 25f286fdfe0cf7ac800ccf3ac62ee5e1d2ceb583 (patch) | |
| tree | 9ce15c25300172ff1258436f7cd27b9864fcc797 /source4/libcli | |
| parent | 3b281c308111323600af4ed44af372d7ceb0b25b (diff) | |
| download | samba-25f286fdfe0cf7ac800ccf3ac62ee5e1d2ceb583.tar.gz samba-25f286fdfe0cf7ac800ccf3ac62ee5e1d2ceb583.tar.bz2 samba-25f286fdfe0cf7ac800ccf3ac62ee5e1d2ceb583.zip | |
r26223: Move loadparm context up in the stack.
(This used to be commit 152e2b1a283675b53affb8f7225644925f171dbd)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/cldap/cldap.c | 3 | ||||
| -rw-r--r-- | source4/libcli/cldap/cldap.h | 1 | ||||
| -rw-r--r-- | source4/libcli/dgram/browse.c | 3 | ||||
| -rw-r--r-- | source4/libcli/dgram/libdgram.h | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c index 9903595dfb..88421ad08d 100644 --- a/source4/libcli/cldap/cldap.c +++ b/source4/libcli/cldap/cldap.c @@ -317,7 +317,7 @@ struct cldap_request *cldap_search_send(struct cldap_socket *cldap, req->dest = socket_address_from_strings(req, cldap->sock->backend_name, io->in.dest_address, - lp_cldap_port(global_loadparm)); + io->in.dest_port); if (!req->dest) goto failed; req->message_id = idr_get_new_random(cldap->idr, req, UINT16_MAX); @@ -572,6 +572,7 @@ struct cldap_request *cldap_netlogon_send(struct cldap_socket *cldap, if (filter == NULL) goto failed; search.in.dest_address = io->in.dest_address; + search.in.dest_port = lp_cldap_port(global_loadparm); search.in.filter = filter; search.in.attributes = attr; search.in.timeout = 2; diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h index e957ccea19..cdee775aa7 100644 --- a/source4/libcli/cldap/cldap.h +++ b/source4/libcli/cldap/cldap.h @@ -98,6 +98,7 @@ struct cldap_socket { struct cldap_search { struct { const char *dest_address; + uint16_t dest_port; const char *filter; const char **attributes; int timeout; diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c index 3b5f67118f..ab831df8cc 100644 --- a/source4/libcli/dgram/browse.c +++ b/source4/libcli/dgram/browse.c @@ -56,6 +56,7 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock, NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, const char *mailslot_name, + const char *my_netbios_name, struct nbt_browse_packet *reply) { NTSTATUS status; @@ -72,7 +73,7 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock, return ndr_map_error2ntstatus(ndr_err); } - make_nbt_name_client(&myname, lp_netbios_name(global_loadparm)); + make_nbt_name_client(&myname, my_netbios_name); dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, request->src_addr, request->src_port); diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index 8165e445bc..9f67d58ae2 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -154,6 +154,7 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock, NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, const char *mailslot_name, + const char *my_netbios_name, struct nbt_browse_packet *reply); NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot, |