s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

this converts all callers that use the Samba4 loadparm lp_ calling
convention to use the lpcfg_ prefix.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

3 files changed, 13 insertions, 13 deletions

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index c9d864c3c3..8e231ccc23 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -55,13 +55,13 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 
 	samctx = iface->nbtsrv->sam_ctx;
 
-	if (lp_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_DOMAIN_CONTROLLER
+	if (lpcfg_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_DOMAIN_CONTROLLER
 	    || !samdb_is_pdc(samctx)) {
 		DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n"));
 		return;		
 	}
 
-	if (strcasecmp_m(name->name, lp_workgroup(iface->nbtsrv->task->lp_ctx)) != 0) {
+	if (strcasecmp_m(name->name, lpcfg_workgroup(iface->nbtsrv->task->lp_ctx)) != 0) {
 		DEBUG(5,("GetDC requested for a domian %s that we don't host\n", name->name));
 		return;
 	}
@@ -72,16 +72,16 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 	pdc = &netlogon_response.data.get_pdc;
 
 	pdc->command = NETLOGON_RESPONSE_FROM_PDC;
-	pdc->pdc_name         = lp_netbios_name(iface->nbtsrv->task->lp_ctx);
+	pdc->pdc_name         = lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx);
 	pdc->unicode_pdc_name = pdc->pdc_name;
-	pdc->domain_name      = lp_workgroup(iface->nbtsrv->task->lp_ctx);
+	pdc->domain_name      = lpcfg_workgroup(iface->nbtsrv->task->lp_ctx);
 	pdc->nt_version       = 1;
 	pdc->lmnt_token       = 0xFFFF;
 	pdc->lm20_token       = 0xFFFF;
 
 	dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
 				      packet, 
-				      lp_netbios_name(iface->nbtsrv->task->lp_ctx),
+				      lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx),
 				      netlogon->req.pdc.mailslot_name,
 				      &netlogon_response);
 }
@@ -137,7 +137,7 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
 
 	dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
 				      packet, 
-				      lp_netbios_name(iface->nbtsrv->task->lp_ctx),
+				      lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx),
 				      netlogon->req.logon.mailslot_name,
 				      &netlogon_response);
 }
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 87e76e08ee..978d354abc 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -51,9 +51,9 @@ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot,
 	logon = &reply.req.reply;
 
 	logon->server           = talloc_asprintf(packet, "\\\\%s", 
-						  lp_netbios_name(iface->nbtsrv->task->lp_ctx));
+						  lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx));
 	logon->user_name        = ntlogon->req.logon.user_name;
-	logon->domain           = lp_workgroup(iface->nbtsrv->task->lp_ctx);
+	logon->domain           = lpcfg_workgroup(iface->nbtsrv->task->lp_ctx);
 	logon->nt_version       = 1;
 	logon->lmnt_token       = 0xFFFF;
 	logon->lm20_token       = 0xFFFF;
@@ -62,7 +62,7 @@ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot,
 
 	dgram_mailslot_ntlogon_reply(reply_iface->dgmsock, 
 				     packet, 
-				     lp_netbios_name(iface->nbtsrv->task->lp_ctx),
+				     lpcfg_netbios_name(iface->nbtsrv->task->lp_ctx),
 				     ntlogon->req.logon.mailslot_name,
 				     &reply);
 }
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 4a3bd13368..0e9a045945 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -83,7 +83,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 	
 		bcast_addr = socket_address_from_strings(tmp_ctx, bcast_dgmsock->sock->backend_name, 
 							 iface->bcast_address, 
-							 lp_dgram_port(iface->nbtsrv->task->lp_ctx));
+							 lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx));
 		if (!bcast_addr) {
 			talloc_free(tmp_ctx);
 			return NT_STATUS_NO_MEMORY;
@@ -93,7 +93,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 		if (!NT_STATUS_IS_OK(status)) {
 			talloc_free(tmp_ctx);
 			DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-				 iface->bcast_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx), 
+				 iface->bcast_address, lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx),
 				 nt_errstr(status)));
 			return status;
 		}
@@ -109,7 +109,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 	}
 
 	bind_addr = socket_address_from_strings(tmp_ctx, iface->dgmsock->sock->backend_name, 
-						bind_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx));
+						bind_address, lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx));
 	if (!bind_addr) {
 		talloc_free(tmp_ctx);
 		return NT_STATUS_NO_MEMORY;
@@ -119,7 +119,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(tmp_ctx);
 		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-			 bind_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx), nt_errstr(status)));
+			 bind_address, lpcfg_dgram_port(iface->nbtsrv->task->lp_ctx), nt_errstr(status)));
 		return status;
 	}