From 5cdb60bd93fcf97fa9ee1c42642237eb7d4c2083 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 24 Dec 1997 08:49:44 +0000 Subject: nmbd_elections.c: Added new parameter to dump_workgroups call. nmbd_incomingdgrams.c: Deal with announcements with servertype == 0 - these are announcements that a machine is shutting down and must be treated differently. nmbd_serverlistdb.c: Exposed remove_server_from_workgroup as external. Added code to dump out workgroups on signal correctly. nmbd_workgroupdb.c: Added new parameter to dump_workgroups call. Jeremy. (This used to be commit f7591109b968c66012af5e9fe818bba8e6f1cf23) --- source3/nmbd/nmbd_workgroupdb.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source3/nmbd/nmbd_workgroupdb.c') diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c index 828e29a024..1b97b92721 100644 --- a/source3/nmbd/nmbd_workgroupdb.c +++ b/source3/nmbd/nmbd_workgroupdb.c @@ -293,22 +293,23 @@ on subnet %s\n", name, subrec->subnet_name)); Dump a copy of the workgroup database into the log file. **************************************************************************/ -void dump_workgroups(void) +void dump_workgroups(BOOL force_write) { struct subnet_record *subrec; - + int debuglevel = force_write ? 0 : 4; + for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) { if (subrec->workgrouplist) { struct work_record *work; - DEBUG(4,("dump_workgroups: dump workgroup on subnet %15s: ", subrec->subnet_name)); - DEBUG(4,(" netmask=%15s:\n", inet_ntoa(subrec->mask_ip))); + DEBUG(debuglevel,("dump_workgroups: dump workgroup on subnet %15s: ", subrec->subnet_name)); + DEBUG(debuglevel,(" netmask=%15s:\n", inet_ntoa(subrec->mask_ip))); for (work = subrec->workgrouplist; work; work = work->next) { - DEBUG(4,("\t%s(%d) current master browser = %s\n", work->work_group, + DEBUG(debuglevel,("\t%s(%d) current master browser = %s\n", work->work_group, work->token, *work->local_master_browser_name ? work->local_master_browser_name : "UNKNOWN" )); if (work->serverlist) @@ -316,7 +317,7 @@ void dump_workgroups(void) struct server_record *servrec; for (servrec = work->serverlist; servrec; servrec = servrec->next) { - DEBUG(4,("\t\t%s %8x (%s)\n", + DEBUG(debuglevel,("\t\t%s %8x (%s)\n", servrec->serv.name, servrec->serv.type, servrec->serv.comment)); } } -- cgit