summaryrefslogtreecommitdiff
path: root/source3/lib/util_names.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-08 16:27:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:09 +0200
commitf348d148b463ca61cbc48d2aadeaa099f7150425 (patch)
tree0c9dd77dca2448a025df3293ccc7850281b8591d /source3/lib/util_names.c
parent3ccc7609476139bc6a906110a2623605f3802159 (diff)
downloadsamba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.gz
samba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.bz2
samba-f348d148b463ca61cbc48d2aadeaa099f7150425.zip
s3-param Remove special case for global_scope()
There is no reason this can't be a normal constant string in the loadparm system. (Past reasons were that we didn't have lp_set_cmdline()) Andrew Bartlett
Diffstat (limited to 'source3/lib/util_names.c')
-rw-r--r--source3/lib/util_names.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/source3/lib/util_names.c b/source3/lib/util_names.c
index d8ebf213cf..78d7988367 100644
--- a/source3/lib/util_names.c
+++ b/source3/lib/util_names.c
@@ -30,35 +30,9 @@
static char *smb_myname;
static char *smb_myworkgroup;
-static char *smb_scope;
static int smb_num_netbios_names;
static char **smb_my_netbios_names;
-/***********************************************************************
- Allocate and set scope. Ensure upper case.
-***********************************************************************/
-
-bool set_global_scope(const char *scope)
-{
- SAFE_FREE(smb_scope);
- smb_scope = SMB_STRDUP(scope);
- if (!smb_scope)
- return False;
- strupper_m(smb_scope);
- return True;
-}
-
-/*********************************************************************
- Ensure scope is never null string.
-*********************************************************************/
-
-const char *global_scope(void)
-{
- if (!smb_scope)
- set_global_scope("");
- return smb_scope;
-}
-
static void free_netbios_names_array(void)
{
int i;
@@ -102,7 +76,6 @@ static bool set_my_netbios_names(const char *name, int i)
void gfree_names(void)
{
gfree_netbios_names();
- SAFE_FREE( smb_scope );
free_netbios_names_array();
free_local_machine_name();
}