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/nameconf.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/nameconf.c')
| -rw-r--r-- | source3/nameconf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/nameconf.c b/source3/nameconf.c index 99951a3b0e..8f33419b9a 100644 --- a/source3/nameconf.c +++ b/source3/nameconf.c @@ -35,6 +35,8 @@ #include "includes.h" extern int DEBUGLEVEL; +extern fstring myworkgroup; + #if 0 struct smbbrowse_parms { @@ -104,7 +106,7 @@ static struct smbbrowse *new_workgroup(struct smbbrowse *model, StrnCpy(new->work_name, workgroup_name, 15); strupper(new->work_name); - if (strequal(lp_workgroup(), workgroup_name)) + if (strequal(myworkgroup, workgroup_name)) StrnCpy(new->browsing_alias, default_name, 15); else sprintf(new->browsing_alias, "%.14s%x", default_name, nexttoken); @@ -289,7 +291,7 @@ static void default_smbbrowse_conf(char *default_name) struct smbbrowse *w; /* The workgroup specified in smb.conf */ - w = new_workgroup((struct smbbrowse *)NULL, lp_workgroup(), default_name); + w = new_workgroup((struct smbbrowse *)NULL, myworkgroup, default_name); w->should_local_master = lp_preferred_master(); w->should_domain_master = lp_domain_master(); w->should_workgroup_member = True; |