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

1 files changed, 5 insertions, 5 deletions

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 88bb6f83c1..d228f92804 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -307,7 +307,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 		      "could not open domain");
 
 	/* Create domain user */
-	if ((acct_name = talloc_asprintf(mem_ctx, "%s$", global_myname())) == NULL) {
+	if ((acct_name = talloc_asprintf(mem_ctx, "%s$", lp_netbios_name())) == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -443,8 +443,8 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 	status = rpccli_netlogon_setup_creds(pipe_hnd,
 					cli->desthost, /* server name */
 					domain,        /* domain */
-					global_myname(), /* client name */
-					global_myname(), /* machine account name */
+					lp_netbios_name(), /* client name */
+					lp_netbios_name(), /* machine account name */
                                         md4_trust_password,
                                         sec_channel_type,
                                         &neg_flags);
@@ -458,7 +458,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 			d_fprintf(stderr, _("Please make sure that no computer "
 					    "account\nnamed like this machine "
 					    "(%s) exists in the domain\n"),
-				 global_myname());
+				 lp_netbios_name());
 		}
 
 		goto done;
@@ -487,7 +487,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 						    "computer account\nnamed "
 						    "like this machine (%s) "
 						    "exists in the domain\n"),
-					 global_myname());
+					 lp_netbios_name());
 			}
 
 			goto done;