diff options
Diffstat (limited to 'source4/cldap_server')
| -rw-r--r-- | source4/cldap_server/cldap_server.c | 10 | ||||
| -rw-r--r-- | source4/cldap_server/netlogon.c | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index 09c9889859..286af058db 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -111,12 +111,12 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_ ret = tsocket_address_inet_from_strings(cldapd, "ip", address, - lp_cldap_port(lp_ctx), + lpcfg_cldap_port(lp_ctx), &socket_address); if (ret != 0) { status = map_nt_error_from_unix(errno); DEBUG(0,("invalid address %s:%d - %s:%s\n", - address, lp_cldap_port(lp_ctx), + address, lpcfg_cldap_port(lp_ctx), gai_strerror(ret), nt_errstr(status))); return status; } @@ -155,7 +155,7 @@ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct l /* if we are allowing incoming packets from any address, then we need to bind to the wildcard address */ - if (!lp_bind_interfaces_only(lp_ctx)) { + if (!lpcfg_bind_interfaces_only(lp_ctx)) { status = cldapd_add_socket(cldapd, lp_ctx, "0.0.0.0"); NT_STATUS_NOT_OK_RETURN(status); } @@ -182,14 +182,14 @@ static void cldapd_task_init(struct task_server *task) NTSTATUS status; struct interface *ifaces; - load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces); + load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces); if (iface_count(ifaces) == 0) { task_server_terminate(task, "cldapd: no network interfaces configured", false); return; } - switch (lp_server_role(task->lp_ctx)) { + switch (lpcfg_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "cldap_server: no CLDAP server required in standalone configuration", false); diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index 7667d9bf3e..aa5533dc98 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -58,7 +58,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, const char *none_attrs[] = {NULL}; struct ldb_result *dom_res = NULL, *user_res = NULL; int ret; - const char **services = lp_server_services(lp_ctx); + const char **services = lpcfg_server_services(lp_ctx); uint32_t server_type; const char *pdc_name; struct GUID domain_uuid; @@ -81,10 +81,10 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, } /* Lookup using long or short domainname */ - if (domain && (strcasecmp_m(domain, lp_dnsdomain(lp_ctx)) == 0)) { + if (domain && (strcasecmp_m(domain, lpcfg_dnsdomain(lp_ctx)) == 0)) { domain_dn = ldb_get_default_basedn(sam_ctx); } - if (netbios_domain && (strcasecmp_m(netbios_domain, lp_sam_name(lp_ctx)) == 0)) { + if (netbios_domain && (strcasecmp_m(netbios_domain, lpcfg_sam_name(lp_ctx)) == 0)) { domain_dn = ldb_get_default_basedn(sam_ctx); } if (domain_dn) { @@ -180,7 +180,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, "objectClass=domain"); if (ret != LDB_SUCCESS) { DEBUG(2,("Error finding domain '%s'/'%s' in sam: %s\n", - lp_dnsdomain(lp_ctx), + lpcfg_dnsdomain(lp_ctx), ldb_dn_get_linearized(domain_dn), ldb_errstring(sam_ctx))); return NT_STATUS_NO_SUCH_DOMAIN; @@ -269,24 +269,24 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, #endif pdc_name = talloc_asprintf(mem_ctx, "\\\\%s", - lp_netbios_name(lp_ctx)); + lpcfg_netbios_name(lp_ctx)); NT_STATUS_HAVE_NO_MEMORY(pdc_name); domain_uuid = samdb_result_guid(dom_res->msgs[0], "objectGUID"); - dns_domain = lp_dnsdomain(lp_ctx); + dns_domain = lpcfg_dnsdomain(lp_ctx); forest_domain = samdb_forest_name(sam_ctx, mem_ctx); NT_STATUS_HAVE_NO_MEMORY(forest_domain); pdc_dns_name = talloc_asprintf(mem_ctx, "%s.%s", strlower_talloc(mem_ctx, - lp_netbios_name(lp_ctx)), + lpcfg_netbios_name(lp_ctx)), dns_domain); NT_STATUS_HAVE_NO_MEMORY(pdc_dns_name); - flatname = lp_workgroup(lp_ctx); + flatname = lpcfg_workgroup(lp_ctx); server_site = samdb_server_site_name(sam_ctx, mem_ctx); NT_STATUS_HAVE_NO_MEMORY(server_site); client_site = samdb_client_site_name(sam_ctx, mem_ctx, src_address, NULL); NT_STATUS_HAVE_NO_MEMORY(client_site); - load_interfaces(mem_ctx, lp_interfaces(lp_ctx), &ifaces); + load_interfaces(mem_ctx, lpcfg_interfaces(lp_ctx), &ifaces); /* * TODO: the caller should pass the address which the client * used to trigger this call, as the client is able to reach @@ -450,7 +450,7 @@ void cldapd_netlogon_request(struct cldap_socket *cldap, } if ((domain == NULL) && (domain_guid == NULL) && (domain_sid == NULL)) { - domain = lp_dnsdomain(cldapd->task->lp_ctx); + domain = lpcfg_dnsdomain(cldapd->task->lp_ctx); } if (version == -1) { |