- remove some incorrect prototypes from server.c

- formatting cleanup in check_master_browser()
- removed unused code from nameserv.c

3 files changed, 45 insertions, 70 deletions

diff --git a/source/nameelect.c b/source/nameelect.c
index 34455b27f9b..8ceae473a78 100644
--- a/source/nameelect.c
+++ b/source/nameelect.c
@@ -54,31 +54,33 @@ extern struct domain_record *domainlist;
   ******************************************************************/
 void check_master_browser(void)
 {
-	static time_t lastrun=0;
-	time_t t = time(NULL);
-	struct domain_record *d;
+  static time_t lastrun=0;
+  time_t t = time(NULL);
+  struct domain_record *d;
 
-	if (!lastrun) lastrun = t;
-	if (t < lastrun + 2*60) return;
-	lastrun = t;
+  if (!lastrun) lastrun = t;
+  if (t < lastrun + 2*60) return;
+  lastrun = t;
 
-	for (d = domainlist; d; d = d->next)
-	{
-		struct work_record *work;
+  dump_workgroups();
 
-		for (work = d->workgrouplist; work; work = work->next)
-		{
-			/* if we are not the browse master of a workgroup, and we can't
-			   find a browser on the subnet, do something about it. */
+  for (d = domainlist; d; d = d->next)
+    {
+      struct work_record *work;
 
-			if (!AM_MASTER(work))
-			{
-				queue_netbios_packet(ClientNMB,NMB_QUERY,CHECK_MASTER,
-				                 work->work_group,0x1d,0,
-				                 True,False,d->bcast_ip);
-			}
-		}
+      for (work = d->workgrouplist; work; work = work->next)
+	{
+	  /* if we are not the browse master of a workgroup, and we can't
+	     find a browser on the subnet, do something about it. */
+
+	  if (!AM_MASTER(work))
+	    {
+	      queue_netbios_packet(ClientNMB,NMB_QUERY,CHECK_MASTER,
+				   work->work_group,0x1d,0,
+				   True,False,d->bcast_ip);
+	    }
 	}
+    }
 }
 
 
@@ -87,32 +89,32 @@ void check_master_browser(void)
   ******************************************************************/
 void browser_gone(char *work_name, struct in_addr ip)
 {
-	struct domain_record *d = find_domain(ip);
-	struct work_record *work = find_workgroupstruct(d, work_name, False);
+  struct domain_record *d = find_domain(ip);
+  struct work_record *work = find_workgroupstruct(d, work_name, False);
 
-	if (!work || !d) return;
+  if (!work || !d) return;
 
-	DEBUG(2,("Forcing election on %s\n",work->work_group));
+  DEBUG(2,("Forcing election on %s\n",work->work_group));
 
-	if (strequal(work->work_group, lp_workgroup()) &&
-	   ip_equal(bcast_ip, d->bcast_ip))
-	{
-		/* we can attempt to become master browser */
-		work->needelection = True;
-	}
-	else
-	{
-		DEBUG(2,("no master browser for persistent entry %s %s\n",
-				  work->work_group, inet_ntoa(d->bcast_ip)));
-
-		/* XXXX oh dear. we are going to have problems here. the
-		   entry is a persistent one, there isn't anyone responsible
-		   for this workgroup up and running, yet we can't find it
-		   and we are going to continually have name_queries until
-		   a master browser is found for this workgroup on the
-		   remote subnet.
-		*/
-	}
+  if (strequal(work->work_group, lp_workgroup()) &&
+      ip_equal(bcast_ip, d->bcast_ip))
+    {
+      /* we can attempt to become master browser */
+      work->needelection = True;
+    }
+  else
+    {
+      DEBUG(2,("no master browser for persistent entry %s %s\n",
+	       work->work_group, inet_ntoa(d->bcast_ip)));
+      
+      /* XXXX oh dear. we are going to have problems here. the
+	 entry is a persistent one, there isn't anyone responsible
+	 for this workgroup up and running, yet we can't find it
+	 and we are going to continually have name_queries until
+	 a master browser is found for this workgroup on the
+	 remote subnet.
+	 */
+    }
 }
 /****************************************************************************
   send an election packet
diff --git a/source/nameserv.c b/source/nameserv.c
index 176d9558532..b6bc8a4f060 100644
--- a/source/nameserv.c
+++ b/source/nameserv.c
@@ -696,28 +696,6 @@ struct name_record *search_for_name(struct nmb_name *question,
   return n;
 }
 
-/* XXXX i think we should only do this if we are a WINS proxy
-		if (!n && bcast)
-		{
-		// now try look up the name at the primary domain controller
-			if (*lp_domain_controller())
-			{
-				struct in_addr dom_ip;
-				dom_ip = *interpret_addr2(lp_domain_controller());
-
-				if (!zero_ip(dom_ip))
-				{
-					struct in_addr found_ip;
-
-					// initiate a netbios query to the PDC
-					queue_netbios_packet(ClientNMB,NMB_QUERY,NAME_CONFIRM_QUERY,
-										question->name, question->name_type, 0,
-										False, True, dom_ip, id);
-					return;
-				}
-			}
-		}
-*/
 
 /***************************************************************************
 reply to a name query.
diff --git a/source/smbd/server.c b/source/smbd/server.c
index a8e1dad8382..206d89423fb 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -84,11 +84,6 @@ extern struct in_addr myip;
 
 static int find_free_connection(int hash);
 
-#ifdef SMB_PASSWD
-extern void generate_next_challenge(char *challenge);
-extern void set_challenge(char *challenge);
-#endif
-
 /* for readability... */
 #define IS_DOS_READONLY(test_mode) (((test_mode) & aRONLY) != 0)
 #define IS_DOS_DIR(test_mode) (((test_mode) & aDIR) != 0)