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, 1 insertions, 19 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index 209c2cb1c9..b485df7741 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -49,7 +49,6 @@ extern char tar_type;
 static int port = 0;
 static char *service;
 static char *desthost;
-static char *calling_name;
 static bool grepable = false;
 static char *cmdstr = NULL;
 const char *cmd_ptr = NULL;
@@ -5042,7 +5041,7 @@ static int do_message_op(struct user_auth_info *a_info)
 
 	status = cli_connect_nb(desthost, have_ip ? &dest_ss : NULL,
 				port ? port : 139, name_type,
-				calling_name, Undefined, &cli);
+				lp_netbios_name(), Undefined, &cli);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("Connection to %s failed. Error %s\n", desthost, nt_errstr(status));
 		return 1;
@@ -5097,11 +5096,6 @@ static int do_message_op(struct user_auth_info *a_info)
 		exit(ENOMEM);
 	}
 
-	/* initialize the netbios name so we can determine whether or
-	   not it was set by a command line option */
-
-	set_global_myname( "" );
-
         /* set default debug level to 1 regardless of what smb.conf sets */
 	setup_logging( "smbclient", DEBUG_DEFAULT_STDERR );
 	load_case_tables();
@@ -5247,11 +5241,6 @@ static int do_message_op(struct user_auth_info *a_info)
 					       poptGetArg(pc));
 	}
 
-	calling_name = talloc_strdup(frame, global_myname() );
-	if (!calling_name) {
-		exit(ENOMEM);
-	}
-
 	if ( override_logfile )
 		setup_logging( lp_logfile(), DEBUG_FILE );
 
@@ -5285,13 +5274,6 @@ static int do_message_op(struct user_auth_info *a_info)
 		}
 	}
 
-	if ( strlen(calling_name) != 0 ) {
-		set_global_myname( calling_name );
-	} else {
-		TALLOC_FREE(calling_name);
-		calling_name = talloc_strdup(frame, global_myname() );
-	}
-
 	smb_encrypt = get_cmdline_auth_info_smb_encrypt(auth_info);
 	if (!init_names()) {
 		fprintf(stderr, "init_names() failed\n");