diff options
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/netapi/serverinfo.c | 2 | ||||
| -rw-r--r-- | source3/lib/popt_common.c | 2 | ||||
| -rw-r--r-- | source3/lib/substitute.c | 6 | ||||
| -rw-r--r-- | source3/lib/util_cmdline.c | 2 | ||||
| -rw-r--r-- | source3/lib/util_names.c | 44 | ||||
| -rw-r--r-- | source3/lib/util_sock.c | 2 |
6 files changed, 12 insertions, 46 deletions
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c index 8f76b4a63e..34db569cd7 100644 --- a/source3/lib/netapi/serverinfo.c +++ b/source3/lib/netapi/serverinfo.c @@ -36,7 +36,7 @@ static WERROR NetServerGetInfo_l_101(struct libnetapi_ctx *ctx, struct SERVER_INFO_101 i; i.sv101_platform_id = PLATFORM_ID_NT; - i.sv101_name = global_myname(); + i.sv101_name = lp_netbios_name(); i.sv101_version_major = lp_major_announce_version(); i.sv101_version_minor = lp_minor_announce_version(); i.sv101_type = lp_default_server_announce(); diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 58f0478a76..0c8f691c25 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -129,7 +129,7 @@ static void popt_common_callback(poptContext con, case 'n': if (arg) { - set_global_myname(arg); + lp_set_cmdline("netbios name", arg); } break; diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index d98a18ae2e..38fdc40dd4 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -80,7 +80,7 @@ bool set_local_machine_name(const char *local_name, bool perm) const char *get_local_machine_name(void) { if (!local_machine || !*local_machine) { - return global_myname(); + return lp_netbios_name(); } return local_machine; @@ -489,7 +489,7 @@ static const char *automount_server(const char *user_name) if (local_machine_name && *local_machine_name) { server_name = talloc_strdup(ctx, local_machine_name); } else { - server_name = talloc_strdup(ctx, global_myname()); + server_name = talloc_strdup(ctx, lp_netbios_name()); } if (!server_name) { @@ -638,7 +638,7 @@ static char *alloc_sub_basic(const char *smb_name, const char *domain_name, if (local_machine_name && *local_machine_name) { a_string = realloc_string_sub(a_string, "%L", local_machine_name); } else { - a_string = realloc_string_sub(a_string, "%L", global_myname()); + a_string = realloc_string_sub(a_string, "%L", lp_netbios_name()); } break; case 'N': diff --git a/source3/lib/util_cmdline.c b/source3/lib/util_cmdline.c index 6c2802c208..39f136821c 100644 --- a/source3/lib/util_cmdline.c +++ b/source3/lib/util_cmdline.c @@ -228,7 +228,7 @@ bool set_cmdline_auth_info_machine_account_creds(struct user_auth_info *auth_inf return false; } - if (asprintf(&account, "%s$@%s", global_myname(), lp_realm()) < 0) { + if (asprintf(&account, "%s$@%s", lp_netbios_name(), lp_realm()) < 0) { return false; } diff --git a/source3/lib/util_names.c b/source3/lib/util_names.c index 78d7988367..0e128eab1c 100644 --- a/source3/lib/util_names.c +++ b/source3/lib/util_names.c @@ -28,8 +28,6 @@ Definitions for all names. ***********************************************************************/ -static char *smb_myname; -static char *smb_myworkgroup; static int smb_num_netbios_names; static char **smb_my_netbios_names; @@ -75,7 +73,6 @@ static bool set_my_netbios_names(const char *name, int i) void gfree_names(void) { - gfree_netbios_names(); free_netbios_names_array(); free_local_machine_name(); } @@ -93,7 +90,7 @@ bool set_netbios_aliases(const char **str_array) for( namecount=0; str_array && (str_array[namecount] != NULL); namecount++ ) ; - if ( global_myname() && *global_myname()) + if ( lp_netbios_name() && *lp_netbios_name()) namecount++; /* Allocate space for the netbios aliases */ @@ -102,8 +99,8 @@ bool set_netbios_aliases(const char **str_array) /* Use the global_myname string first */ namecount=0; - if ( global_myname() && *global_myname()) { - set_my_netbios_names( global_myname(), namecount ); + if ( lp_netbios_name() && *lp_netbios_name()) { + set_my_netbios_names( lp_netbios_name(), namecount ); namecount++; } @@ -138,19 +135,12 @@ bool init_names(void) { int n; - if (global_myname() == NULL || *global_myname() == '\0') { - if (!set_global_myname(myhostname())) { - DEBUG( 0, ( "init_names: malloc fail.\n" ) ); - return False; - } - } - if (!set_netbios_aliases(lp_netbios_aliases())) { DEBUG( 0, ( "init_names: malloc fail.\n" ) ); return False; } - set_local_machine_name(global_myname(),false); + set_local_machine_name(lp_netbios_name(),false); DEBUG( 5, ("Netbios name list:-\n") ); for( n=0; my_netbios_names(n); n++ ) { @@ -161,25 +151,6 @@ bool init_names(void) return( True ); } -/*********************************************************************** - Allocate and set myname. Ensure upper case. -***********************************************************************/ - -bool set_global_myname(const char *myname) -{ - SAFE_FREE(smb_myname); - smb_myname = SMB_STRDUP(myname); - if (!smb_myname) - return False; - strupper_m(smb_myname); - return True; -} - -const char *global_myname(void) -{ - return smb_myname; -} - /****************************************************************** get the default domain/netbios name to be used when dealing with our passdb list of accounts @@ -190,11 +161,6 @@ const char *get_global_sam_name(void) if (IS_DC) { return lp_workgroup(); } - return global_myname(); + return lp_netbios_name(); } -void gfree_netbios_names(void) -{ - SAFE_FREE( smb_myname ); - SAFE_FREE( smb_myworkgroup ); -} diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index fd91fd58dc..9b8632b181 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -1370,7 +1370,7 @@ bool is_myname_or_ipaddr(const char *s) } /* Optimize for the common case */ - if (strequal(servername, global_myname())) { + if (strequal(servername, lp_netbios_name())) { return true; } |