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/nmbd/nmbd_workgroupdb.c | |
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/nmbd/nmbd_workgroupdb.c')
-rw-r--r-- | source3/nmbd/nmbd_workgroupdb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c index b834525747..0b392680df 100644 --- a/source3/nmbd/nmbd_workgroupdb.c +++ b/source3/nmbd/nmbd_workgroupdb.c @@ -29,8 +29,8 @@ extern int ClientNMB; extern int DEBUGLEVEL; -extern pstring myname; -extern fstring myworkgroup; +extern pstring global_myname; +extern fstring global_myworkgroup; extern char **my_netbios_names; extern uint16 samba_nb_type; extern struct in_addr ipzero; @@ -246,7 +246,7 @@ void initiate_myworkgroup_startup(struct subnet_record *subrec, struct work_reco { int i; - if(!strequal(myworkgroup, work->work_group)) + if(!strequal(global_myworkgroup, work->work_group)) return; /* If this is a broadcast subnet then start elections on it @@ -264,11 +264,11 @@ workgroup %s on subnet %s\n", work->work_group, subrec->subnet_name)); /* Register the WORKGROUP<0> and WORKGROUP<1e> names on the network. */ - register_name(subrec,myworkgroup,0x0,samba_nb_type|NB_GROUP, + register_name(subrec,global_myworkgroup,0x0,samba_nb_type|NB_GROUP, NULL, fail_register,NULL); - register_name(subrec,myworkgroup,0x1e,samba_nb_type|NB_GROUP, + register_name(subrec,global_myworkgroup,0x1e,samba_nb_type|NB_GROUP, NULL, fail_register,NULL); @@ -278,7 +278,7 @@ workgroup %s on subnet %s\n", work->work_group, subrec->subnet_name)); int stype = lp_default_server_announce() | (lp_local_master() ? SV_TYPE_POTENTIAL_BROWSER : 0 ); - if(!strequal(myname, name)) + if(!strequal(global_myname, name)) stype &= ~(SV_TYPE_MASTER_BROWSER|SV_TYPE_POTENTIAL_BROWSER| SV_TYPE_DOMAIN_MASTER|SV_TYPE_DOMAIN_MEMBER); |