- changed some debug levels in clientutil.c

- added dir_check_ftype() to clean up the file type checking a bit

- added check for libc version >= 5 for setfsuid() for Linux

- moved the AM_MASTER() and related macros to nameserv.h

- added proper defines for the various netbios announce types

- don't call the announce_backup() code, as I'm pretty sure its wrong
it sent ANN_GetBackupListReq packets as broadcasts, they are supposed
to be used only by clients to the master browser to find a list of
available backup servers to remote a netserverenum to, I don't think
nmbd should ever send one.

- fixed a bug in the browse list writing

- minor debug cleanups

- put in the code to discard our own broadcasts (it won't work for
multi-homed hosts though)

- changed ELECTION_VERSION to 1 so we can be beaten by a NT 3.51 server by
lowering the os level.

- only do sync_browse_lists() if we are the master browser, otherwise
we'll cause network overload

- don't call tell_become_backup() as it appears to be badly broken, it
should only be used when the machine being told has its MAINTAIN_LIST
to to auto. Not calling it does no great harm anyway

- fix a nasty bug where becomebackup was confused with reset browser!

- make setbuffer() not get caught by the auto protototypes
(This used to be commit cfbad9b08242962f41595273de08a7293fe432b1)

1 files changed, 8 insertions, 8 deletions

diff --git a/source3/namedb.c b/source3/namedb.c
index 3e19f3fc8a..fc14c4d5c6 100644
--- a/source3/namedb.c
+++ b/source3/namedb.c
@@ -177,7 +177,8 @@ static void remove_old_servers(struct work_record *work, time_t t)
 /*******************************************************************
   remove workgroups
   ******************************************************************/
-struct work_record *remove_workgroup(struct domain_record *d, struct work_record *work)
+struct work_record *remove_workgroup(struct domain_record *d, 
+				     struct work_record *work)
 {
   struct work_record *ret_work = NULL;
   
@@ -388,19 +389,18 @@ static void dump_workgroups(void)
 	{
 	  struct work_record *work;
 	  
-	  DEBUG(3,("dump domain %15s: ", inet_ntoa(d->bcast_ip)));
-	  DEBUG(3,(" %15s:\n", inet_ntoa(d->bcast_ip)));
+	  DEBUG(4,("dump domain bcast=%15s: ", inet_ntoa(d->bcast_ip)));
+	  DEBUG(4,(" netmask=%15s:\n", inet_ntoa(d->mask_ip)));
 	  
 	  for (work = d->workgrouplist; work; work = work->next)
 	    {
+	      DEBUG(4,("\t%s(%d)\n", work->work_group, work->token));
 	      if (work->serverlist)
 		{
-		  struct server_record *s;
-		  
-		  DEBUG(3,("\t%s(%d)\n", work->work_group, work->token));
+		  struct server_record *s;		  
 		  for (s = work->serverlist; s; s = s->next)
 		    {
-		      DEBUG(3,("\t\t%s %8x (%s)\n",
+		      DEBUG(4,("\t\t%s %8x (%s)\n",
 			       s->serv.name, s->serv.type, s->serv.comment));
 		    }
 		}
@@ -674,7 +674,7 @@ void write_browse_list(void)
 	      sprintf(tmp, "\"%s\"", s->serv.name);
 	      fprintf(f, "%-25s ", tmp);
 	      fprintf(f, "%08x ", s->serv.type);
-	      sprintf(tmp, "\"%s\"", s->serv.comment);
+	      sprintf(tmp, "\"%s\" ", s->serv.comment);
 	      fprintf(f, "%-30s", tmp);
 	      fprintf(f, "\"%s\"\n", work->work_group);
 	    }