diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 23:57:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:37 +0100 |
| commit | c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124 (patch) | |
| tree | a8f2d25736e2edb08fc4b03b21f3a2949b1e2117 /source4/cldap_server | |
| parent | 04304808cabd0f05a5ff5bf23d8fd950eff8d6f3 (diff) | |
| download | samba-c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124.tar.gz samba-c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124.tar.bz2 samba-c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124.zip | |
r26325: Remove use of global_loadparm in netif.
(This used to be commit e452cb28594f23add7c00247ed39e8323aea78a6)
Diffstat (limited to 'source4/cldap_server')
| -rw-r--r-- | source4/cldap_server/cldap_server.c | 6 | ||||
| -rw-r--r-- | source4/cldap_server/netlogon.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index f2c3568469..d71e933b5f 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -123,7 +123,7 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_ */ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct loadparm_context *lp_ctx) { - int num_interfaces = iface_count(); + int num_interfaces = iface_count(lp_ctx); TALLOC_CTX *tmp_ctx = talloc_new(cldapd); NTSTATUS status; @@ -136,7 +136,7 @@ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct l int i; for (i=0; i<num_interfaces; i++) { - const char *address = talloc_strdup(tmp_ctx, iface_n_ip(i)); + const char *address = talloc_strdup(tmp_ctx, iface_n_ip(lp_ctx, i)); status = cldapd_add_socket(cldapd, lp_ctx, address); NT_STATUS_NOT_OK_RETURN(status); } @@ -155,7 +155,7 @@ static void cldapd_task_init(struct task_server *task) struct cldapd_server *cldapd; NTSTATUS status; - if (iface_count() == 0) { + if (iface_count(task->lp_ctx) == 0) { task_server_terminate(task, "cldapd: no network interfaces configured"); return; } diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index b123027a7c..d1f001e333 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -187,7 +187,7 @@ static NTSTATUS cldapd_netlogon_fill(struct cldapd_server *cldapd, lp_workgroup(lp_ctx)); server_site = "Default-First-Site-Name"; client_site = "Default-First-Site-Name"; - pdc_ip = iface_best_ip(src_address); + pdc_ip = iface_best_ip(lp_ctx, src_address); ZERO_STRUCTP(netlogon); |