summaryrefslogtreecommitdiff
path: root/source4/libcli/cldap
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 23:33:16 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:53 +0100
commitda0f222f432c4fc8bf5da80baf849ca32b315ca0 (patch)
tree3af5624aca9ce68b4b169ed1066dd03e8b2e7d9d /source4/libcli/cldap
parent5b357ca8774d97e85153151552bc052cfaf26c1b (diff)
downloadsamba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.tar.gz
samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.tar.bz2
samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.zip
r26271: Remove some more uses of global_loadparm.
(This used to be commit e9875fcd56de0748ed78d7e3c9cdb4919cd96d3c)
Diffstat (limited to 'source4/libcli/cldap')
-rw-r--r--source4/libcli/cldap/cldap.c2
-rw-r--r--source4/libcli/cldap/cldap.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 88421ad08d..87a8957fbc 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -572,7 +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.dest_port = io->in.dest_port;
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 cdee775aa7..217ac0ff1b 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -73,6 +73,7 @@ struct cldap_request {
struct cldap_socket {
struct socket_context *sock;
struct event_context *event_ctx;
+ struct loadparm_context *lp_ctx;
/* the fd event */
struct fd_event *fde;
@@ -151,6 +152,7 @@ NTSTATUS cldap_error_reply(struct cldap_socket *cldap,
struct cldap_netlogon {
struct {
const char *dest_address;
+ uint16_t dest_port;
const char *realm;
const char *host;
const char *user;