From aa864415c5183c948fe9ae221023d40265c38013 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Tue, 20 May 1997 00:32:51 +0000 Subject: 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) --- source3/nmbd/nmbd.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source3/nmbd') diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 550f3198f7..11f005b785 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -40,6 +40,7 @@ int ClientDGRAM = -1; extern pstring myhostname; static pstring host_file; extern pstring myname; +extern fstring myworkgroup; /* are we running as a daemon ? */ static BOOL is_daemon = False; @@ -67,7 +68,7 @@ static int sig_term() /* announce all server entries as 0 time-to-live, 0 type */ /* XXXX don't care if we never receive a response back... yet */ - remove_my_servers(); + announce_my_servers_removed(); /* XXXX other things: if we are a master browser, force an election? */ @@ -203,9 +204,6 @@ BOOL reload_services(BOOL test) reload_services(True); } - load_interfaces(); - add_subnet_interfaces(); - /* Do a sanity check for a misconfigured nmbd */ if(lp_wins_support() && *lp_wins_server()) { DEBUG(0,("ERROR: both 'wins support = true' and 'wins server = ' \ @@ -502,6 +500,8 @@ static void usage(char *pname) reload_services(True); + strcpy(myworkgroup, lp_workgroup()); + set_samba_nb_type(); if (!is_daemon && !is_a_socket(0)) { @@ -549,15 +549,16 @@ static void usage(char *pname) DEBUG(3,("Loaded hosts file\n")); } + load_interfaces(); + add_my_subnets(myworkgroup); + add_my_names(); - if (strequal(lp_workgroup(),"*")) { + if (strequal(myworkgroup,"*")) { DEBUG(0,("ERROR: a workgroup name of * is no longer supported\n")); exit(1); } - add_my_subnets(lp_workgroup()); - DEBUG(3,("Checked names\n")); load_netbios_names(); -- cgit