s3-param Remove special case for global_myname(), rename to lp_netbios_name()

There is no reason this can't be a normal constant string in the
loadparm system, now that we have lp_set_cmdline() to handle overrides
correctly.

Andrew Bartlett

4 files changed, 10 insertions, 10 deletions

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index b519358558..3c685fd9a7 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -185,7 +185,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 	if (workstation) {
 		fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
 	} else {
-		fstr_sprintf( clnt_name_slash, "\\\\%s", global_myname() );
+		fstr_sprintf( clnt_name_slash, "\\\\%s", lp_netbios_name() );
 	}
 
 	/* Initialise input parameters */
@@ -279,7 +279,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 
 	status = dcerpc_netr_LogonSamLogon(b, mem_ctx,
 					   cli->srv_name_slash,
-					   global_myname(),
+					   lp_netbios_name(),
 					   &clnt_creds,
 					   &ret_creds,
 					   logon_type,
@@ -441,7 +441,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
 	status = dcerpc_netr_LogonSamLogon(b, mem_ctx,
 					   server_name_slash,
-					   global_myname(),
+					   lp_netbios_name(),
 					   &clnt_creds,
 					   &ret_creds,
 					   NetlogonNetworkInformation,
@@ -556,7 +556,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
 
 	status = dcerpc_netr_LogonSamLogonEx(b, mem_ctx,
 					     server_name_slash,
-					     global_myname(),
+					     lp_netbios_name(),
 					     NetlogonNetworkInformation,
 					     logon,
 					     validation_level,
@@ -608,7 +608,7 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
 		result = rpccli_netlogon_setup_creds(cli,
 						     cli->desthost, /* server name */
 						     lp_workgroup(), /* domain */
-						     global_myname(), /* client name */
+						     lp_netbios_name(), /* client name */
 						     account_name, /* machine account name */
 						     orig_trust_passwd_hash,
 						     sec_channel_type,
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 682f35ece0..0b9470620d 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -1087,7 +1087,7 @@ static NTSTATUS create_schannel_auth_rpc_bind_req(struct rpc_pipe_client *cli,
 	r.Flags				= NL_FLAG_OEM_NETBIOS_DOMAIN_NAME |
 					  NL_FLAG_OEM_NETBIOS_COMPUTER_NAME;
 	r.oem_netbios_domain.a		= cli->auth->domain;
-	r.oem_netbios_computer.a	= global_myname();
+	r.oem_netbios_computer.a	= lp_netbios_name();
 
 	status = dcerpc_push_schannel_bind(cli, &r, auth_token);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -2330,7 +2330,7 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx,
 	}
 
 	status = auth_ntlmssp_client_start(NULL,
-				      global_myname(),
+				      lp_netbios_name(),
 				      lp_workgroup(),
 				      lp_client_ntlmv2_auth(),
 				      &ntlmssp_ctx);
diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c
index b7ef39f8e6..f48c4c7318 100644
--- a/source3/rpc_client/cli_pipe_schannel.c
+++ b/source3/rpc_client/cli_pipe_schannel.c
@@ -58,7 +58,7 @@ static NTSTATUS get_schannel_session_key_common(struct rpc_pipe_client *netlogon
 	status = rpccli_netlogon_setup_creds(netlogon_pipe,
 					cli->desthost, /* server name */
 					domain,	       /* domain */
-					global_myname(), /* client name */
+					lp_netbios_name(), /* client name */
 					machine_account, /* machine account name */
 					machine_pwd,
 					sec_chan_type,
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 3c15e2ffb0..5c8448b29b 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -47,7 +47,7 @@ WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli,
 	ZERO_STRUCT(devmode_ctr);
 
 	level1.size	= 28;
-	level1.client	= talloc_asprintf(mem_ctx, "\\\\%s", global_myname());
+	level1.client	= talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name());
 	W_ERROR_HAVE_NO_MEMORY(level1.client);
 	level1.user	= cli->auth->user_name;
 	level1.build	= 1381;
@@ -230,7 +230,7 @@ WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli,
 	level1.major		= 2;
 	level1.minor		= 0;
 	level1.processor	= 0;
-	level1.client		= talloc_asprintf(mem_ctx, "\\\\%s", global_myname());
+	level1.client		= talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name());
 	W_ERROR_HAVE_NO_MEMORY(level1.client);
 	level1.user		= cli->auth->user_name;