diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-05-20 00:32:51 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-05-20 00:32:51 +0000 |
| commit | aa864415c5183c948fe9ae221023d40265c38013 (patch) | |
| tree | 29e0aa79328568d93211d175353f1fd1bc2d3737 /source3/namedbwork.c | |
| parent | 5495a3446d769a2501ee558bda54146bef507e78 (diff) | |
| download | samba-aa864415c5183c948fe9ae221023d40265c38013.tar.gz samba-aa864415c5183c948fe9ae221023d40265c38013.tar.bz2 samba-aa864415c5183c948fe9ae221023d40265c38013.zip | |
dir.c: Fixed double slash issue.
includes.h: Changed to ifdef FAST_SHARE_MODES.
ipc.c: Changed lp_workgroup() to myworkgroup.
loadparm.c: Added new shared mem parameters. Added Luke's fix.
locking.c: Rewrite to do share modes better (both fast and slow modes).
nameannounce.c: Changed lp_workgroup() to myworkgroup. Added Luke's fix.
nameconf.c: Changed lp_workgroup() to myworkgroup.
namedbname.c: Improved debug.
namedbserver.c: Changed lp_workgroup() to myworkgroup.
namedbsubnet.c: Added Luke's fix - rewritten somewhat.
namedbwork.c: Changed lp_workgroup() to myworkgroup.
nameelect.c: Added Luke's fix - rewritten somewhat.
nameresp.c: Stoped shadowing global.
nameserv.c: Added Luke's fix - Improved debug.
nameservreply.c: Improved debug.
namework.c: Changed lp_workgroup() to myworkgroup.
nmbd.c: Added Luke's fix - Changed lp_workgroup() to myworkgroup.
pipes.c: Changed lp_workgroup() to myworkgroup.
proto.h: Added Luke's fix, added smb_shm_ proto's.
reply.c: Changed lp_workgroup() to myworkgroup.
server.c: Rewrite to do share modes better (both fast and slow modes).
shmem.c: Rewrite to do share modes better (both fast and slow modes).
smb.h: Rewrite to do share modes better (both fast and slow modes).
status.c: Rewrite to do share modes better (both fast and slow modes).
trans2.c: Fixed double slash issue.
util.c: Tidied up, created myworkgroup.
Jeremy Allison (jallison@whistle.com).
(This used to be commit 2a1711eaaf08bb6776770cd3c96b3010f431a677)
Diffstat (limited to 'source3/namedbwork.c')
| -rw-r--r-- | source3/namedbwork.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/namedbwork.c b/source3/namedbwork.c index 8c249cc82c..d752916815 100644 --- a/source3/namedbwork.c +++ b/source3/namedbwork.c @@ -40,6 +40,8 @@ extern struct subnet_record *subnetlist; extern struct in_addr wins_ip; +extern fstring myworkgroup; + int workgroup_count = 0; /* unique index key: one for each workgroup */ @@ -192,8 +194,8 @@ struct work_record *find_workgroupstruct(struct subnet_record *d, if ((work = make_workgroup(name))) { if (!ip_equal(d->bcast_ip, wins_ip) && - lp_preferred_master() && - strequal(lp_workgroup(), name)) + lp_preferred_master() && lp_local_master() && + strequal(myworkgroup, name)) { DEBUG(3, ("preferred master startup for %s\n", work->work_group)); work->needelection = True; |