- 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, 6 insertions, 9 deletions

diff --git a/source3/nameresp.c b/source3/nameresp.c
index 8ed2ba92c4..435864a784 100644
--- a/source3/nameresp.c
+++ b/source3/nameresp.c
@@ -174,7 +174,8 @@ void reply_netbios_packet(struct packet_struct *p1,int trn_id,int rcode,int opco
   initiate a netbios packet
   ****************************************************************************/
 uint16 initiate_netbios_packet(int fd,int quest_type,char *name,int name_type,
-			       int nb_flags,BOOL bcast,BOOL recurse,struct in_addr to_ip)
+			       int nb_flags,BOOL bcast,BOOL recurse,
+			       struct in_addr to_ip)
 {
   struct packet_struct p;
   struct nmb_packet *nmb = &p.packet.nmb;
@@ -432,13 +433,11 @@ void listen_for_packets(BOOL run_election)
     {
       struct packet_struct *packet = read_packet(ClientNMB, NMB_PACKET);
       if (packet) {
-#if 0
+#if 1
 	if (ip_equal(packet->ip,myip) &&
 	    (packet->port == NMB_PORT || packet->port == DGRAM_PORT)) {
-	  DEBUG(3,("discarding packet from %s:%d\n",
+	  DEBUG(5,("discarding own packet from %s:%d\n",
 		   inet_ntoa(packet->ip),packet->port));	  
-	  DEBUG(3,("myip=%s eq=%d\n",
-		   inet_ntoa(myip),ip_equal(packet->ip,myip)));
 	  free_packet(packet);
 	} else 
 #endif
@@ -452,13 +451,11 @@ void listen_for_packets(BOOL run_election)
     {
       struct packet_struct *packet = read_packet(ClientDGRAM, DGRAM_PACKET);
       if (packet) {
-#if 0
+#if 1
 	if (ip_equal(packet->ip,myip) &&
 	      (packet->port == NMB_PORT || packet->port == DGRAM_PORT)) {
-	  DEBUG(3,("discarding packet from %s:%d\n",
+	  DEBUG(5,("discarding own packet from %s:%d\n",
 		   inet_ntoa(packet->ip),packet->port));	  
-	  DEBUG(3,("myip=%s eq=%d\n",
-		   inet_ntoa(myip),ip_equal(packet->ip,myip)));
 	  free_packet(packet);
 	} else
 #endif