#include "includes.h"
-extern pstring global_myname;
-extern fstring global_myworkgroup;
extern BOOL found_lm_clients;
#if 0
char *comment = buf+31;
struct work_record *work;
struct server_record *servrec;
- char *work_name;
+ const char *work_name;
char *source_name = dgram->source_name.name;
START_PROFILE(host_announce);
* to be our primary workgroup name.
*/
- if(strequal(work_name, global_myname))
- work_name = global_myworkgroup;
+ if(strequal(work_name, global_myname()))
+ work_name = lp_workgroup();
/*
* We are being very agressive here in adding a workgroup
goto done;
}
- if((work = find_workgroup_on_subnet(subrec, global_myworkgroup)) == NULL)
+ if((work = find_workgroup_on_subnet(subrec, lp_workgroup())) == NULL)
{
DEBUG(0,("process_master_browser_announce: Cannot find workgroup %s on subnet %s\n",
- global_myworkgroup, subrec->subnet_name));
+ lp_workgroup(), subrec->subnet_name));
goto done;
}
char *announce_name = buf+9;
struct work_record *work;
struct server_record *servrec;
- char *work_name;
+ const char *work_name;
char *source_name = dgram->source_name.name;
pstring comment;
char *s = buf+9;
* not needed in the LanMan announce code, but it won't hurt.
*/
- if(strequal(work_name, global_myname))
- work_name = global_myworkgroup;
+ if(strequal(work_name, global_myname()))
+ work_name = lp_workgroup();
/*
* We are being very agressive here in adding a workgroup
/* We always return at least one name - our own. */
count = 1;
- StrnCpy(p,global_myname,15);
+ StrnCpy(p,global_myname(),15);
strupper(p);
p = skip_string(p,1);
if(count >= (unsigned int)max_number_requested)
break;
- if(strnequal(servrec->serv.name, global_myname,15))
+ if(strnequal(servrec->serv.name, global_myname(),15))
continue;
if(!(servrec->serv.type & SV_TYPE_BACKUP_BROWSER))
send_mailslot(True, BROWSE_MAILSLOT,
outbuf,PTR_DIFF(p,outbuf),
- global_myname, 0,
+ global_myname(), 0,
send_to_name->name,0,
sendto_ip, subrec->myip, port);
}
for the requested workgroup. That means it must be our
workgroup. */
- if(strequal(workgroup_name, global_myworkgroup) == False)
+ if(strequal(workgroup_name, lp_workgroup()) == False)
{
DEBUG(7,("process_get_backup_list_request: Ignoring announce request for workgroup %s.\n",
workgroup_name));
nmb_namestr(&dgram->dest_name)));
/* We only send announcement requests on our workgroup. */
- if(strequal(workgroup_name, global_myworkgroup) == False)
+ if(strequal(workgroup_name, lp_workgroup()) == False)
{
DEBUG(7,("process_announce_request: Ignoring announce request for workgroup %s.\n",
workgroup_name));
nmb_namestr(&dgram->dest_name)));
/* We only send announcement requests on our workgroup. */
- if(strequal(workgroup_name, global_myworkgroup) == False)
+ if(strequal(workgroup_name, lp_workgroup()) == False)
{
DEBUG(7,("process_lm_announce_request: Ignoring announce request for workgroup %s.\n",
workgroup_name));