diff options
Diffstat (limited to 'source3/lib/substitute.c')
| -rw-r--r-- | source3/lib/substitute.c | 53 |
1 files changed, 9 insertions, 44 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 026df0f67f..6d96a1820f 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -25,41 +25,9 @@ fstring local_machine=""; fstring remote_arch="UNKNOWN"; userdom_struct current_user_info; fstring remote_proto="UNKNOWN"; +fstring remote_machine=""; extern pstring global_myname; -static fstring remote_machine=""; - - -void set_local_machine_name(const char* local_name) -{ - fstring tmp_local_machine; - - fstrcpy(tmp_local_machine,local_name); - trim_string(tmp_local_machine," "," "); - strlower(tmp_local_machine); - alpha_strcpy(local_machine,tmp_local_machine,SAFE_NETBIOS_CHARS,sizeof(local_machine)-1); -} - -void set_remote_machine_name(const char* remote_name) -{ - fstring tmp_remote_machine; - - fstrcpy(tmp_remote_machine,remote_name); - trim_string(tmp_remote_machine," "," "); - strlower(tmp_remote_machine); - alpha_strcpy(remote_machine,tmp_remote_machine,SAFE_NETBIOS_CHARS,sizeof(remote_machine)-1); -} - -const char* get_remote_machine_name(void) -{ - return remote_machine; -} - -const char* get_local_machine_name(void) -{ - return local_machine; -} - /******************************************************************* Given a pointer to a %$(NAME) expand it as an environment variable. Return the number of characters by which the pointer should be advanced. @@ -220,15 +188,14 @@ static char *automount_path(const char *user_name) moved out to a separate function. *******************************************************************/ -static const char *automount_server(const char *user_name) +static char *automount_server(const char *user_name) { static pstring server_name; - const char *local_machine_name = get_local_machine_name(); /* use the local machine name as the default */ /* this will be the default if WITH_AUTOMOUNT is not used or fails */ - if (local_machine_name && *local_machine_name) - pstrcpy(server_name, local_machine_name); + if (*local_machine) + pstrcpy(server_name, local_machine); else pstrcpy(server_name, global_myname); @@ -262,7 +229,6 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len) char *p, *s; fstring pidstr; struct passwd *pass; - const char *local_machine_name = get_local_machine_name(); for (s=str; (p=strchr_m(s, '%'));s=p) { fstring tmp_str; @@ -295,8 +261,8 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len) string_sub(p,"%I", client_addr(),l); break; case 'L' : - if (local_machine_name && *local_machine_name) - string_sub(p,"%L", local_machine_name,l); + if (*local_machine) + string_sub(p,"%L", local_machine,l); else string_sub(p,"%L", global_myname,l); break; @@ -320,7 +286,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len) string_sub(p,"%h", myhostname(),l); break; case 'm' : - string_sub(p,"%m", get_remote_machine_name(),l); + string_sub(p,"%m", remote_machine,l); break; case 'v' : string_sub(p,"%v", VERSION,l); @@ -415,7 +381,6 @@ char *alloc_sub_basic(const char *smb_name, const char *str) char *b, *p, *s, *t, *r, *a_string; fstring pidstr; struct passwd *pass; - const char *local_machine_name = get_local_machine_name(); a_string = strdup(str); if (a_string == NULL) { @@ -450,8 +415,8 @@ char *alloc_sub_basic(const char *smb_name, const char *str) t = realloc_string_sub(t, "%I", client_addr()); break; case 'L' : - if (local_machine_name && *local_machine_name) - t = realloc_string_sub(t, "%L", local_machine_name); + if (*local_machine) + t = realloc_string_sub(t, "%L", local_machine); else t = realloc_string_sub(t, "%L", global_myname); break; |