diff options
| author | Richard Sharpe <sharpe@samba.org> | 1998-09-28 09:22:06 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 1998-09-28 09:22:06 +0000 |
| commit | c8c89585a30310482ce65a792f814c1937d225e4 (patch) | |
| tree | 948c8afc0e06d72a727e776bb0bf400f2273f43a /source3 | |
| parent | 2d87954bc06b5c7cb50f11e12c112d7c1d7a5a99 (diff) | |
| download | samba-c8c89585a30310482ce65a792f814c1937d225e4.tar.gz samba-c8c89585a30310482ce65a792f814c1937d225e4.tar.bz2 samba-c8c89585a30310482ce65a792f814c1937d225e4.zip | |
The previous fix for WINS on the WINS server was wrong. It
caused nmbd to exit :-(
We now set the variable szWINSserver after the smb.conf file
has been processed, but only of we are a WINS server.
(This used to be commit 17212991cf0f49c5afc77cbd82dc6ce8a13f1405)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8e222f5da5..259bb74581 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -809,9 +809,7 @@ static void init_globals(void) /* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */ string_set(&Globals.szLogonHome, "\\\\%N\\%U"); string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile"); - /* Set szWINSserver to 127.0.0.1 so that we have something reasonable */ - /* in case it is not set in the smb.conf */ - string_set(&Globals.szWINSserver, "127.0.0.1"); + string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast"); Globals.bLoadPrinters = True; @@ -2484,6 +2482,15 @@ BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc) bLoaded = True; + /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */ + /* if bWINSsupport is True */ + + if (Globals.bWINSsupport) { + + string_set(&Globals.szWINSserver, "127.0.0.1"); + + } + return (bRetval); } |