diff options
| author | Jeremy Allison <jra@samba.org> | 1998-04-25 01:12:08 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-04-25 01:12:08 +0000 |
| commit | e7ac86607c80912e55ac7179b100cea22749c16f (patch) | |
| tree | 257b85ec9e88be65c95cf82afb1f6e7c4c20e4c7 /source3/param | |
| parent | 9189005f7f884123d29c8f27db73687b68c80bb9 (diff) | |
| download | samba-e7ac86607c80912e55ac7179b100cea22749c16f.tar.gz samba-e7ac86607c80912e55ac7179b100cea22749c16f.tar.bz2 samba-e7ac86607c80912e55ac7179b100cea22749c16f.zip | |
This looks like a big change but really isn't.
It is changing the global variables "myname" and "myworkgroup"
to "global_myname" and "global_myworkgroup" respectively.
This is to make it very explicit when we are messing
with a global (don't ask - it makes the domain client
code much clearer :-).
Jeremy.
(This used to be commit 866406bfe399cf757c8275093dacd5ce4843afa0)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 661ca901fa..c96669dba4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -69,7 +69,7 @@ BOOL bLoaded = False; extern int DEBUGLEVEL; extern pstring user_socket_options; -extern pstring myname; +extern pstring global_myname; #ifndef GLOBAL_NAME #define GLOBAL_NAME "global" @@ -432,7 +432,7 @@ static struct parm_struct parm_table[] = {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC|FLAG_PRINT}, {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, 0}, {"workgroup", P_USTRING, P_GLOBAL, &Globals.szWorkGroup, NULL, NULL, FLAG_BASIC}, - {"netbios name", P_UGSTRING,P_GLOBAL, myname, NULL, NULL, FLAG_BASIC}, + {"netbios name", P_UGSTRING,P_GLOBAL, global_myname, NULL, NULL, FLAG_BASIC}, {"netbios aliases", P_STRING, P_GLOBAL, &Globals.szNetbiosAliases, NULL, NULL, 0}, {"server string", P_STRING, P_GLOBAL, &Globals.szServerString, NULL, NULL, FLAG_BASIC}, {"interfaces", P_STRING, P_GLOBAL, &Globals.szInterfaces, NULL, NULL, FLAG_BASIC}, |