svn commit: samba r4018 - in branches/SAMBA_3_0/source/smbd: .

[jerry at samba.org]

Author: jerry
Date: 2004-11-30 15:52:46 +0000 (Tue, 30 Nov 2004)
New Revision: 4018

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4018

Log:
* move claim_connection from the netbios session request 
  reply code to the negprot reply code to cope with 
  client connections on port 445.  Fixes the spurious
  "register_message_flags: tdb fetch failed" errors.

* don't run the backgroup LPQ daemon when we are running 
  in interactive mode.


Modified:
   branches/SAMBA_3_0/source/smbd/negprot.c
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/negprot.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/negprot.c	2004-11-30 06:41:45 UTC (rev 4017)
+++ branches/SAMBA_3_0/source/smbd/negprot.c	2004-11-30 15:52:46 UTC (rev 4018)
@@ -523,6 +523,12 @@
  
 	/* possibly reload - change of architecture */
 	reload_services(True);      
+	
+	/* moved from the netbios session setup code since we don't have that 
+	   when the client connects to port 445.  Of course there is a small
+	   window where we are listening to messages   -- jerry */
+
+	claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_PRINT_GENERAL);
     
 	/* Check for protocols, most desirable first */
 	for (protocol = 0; supported_protocols[protocol].proto_name; protocol++) {

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2004-11-30 06:41:45 UTC (rev 4017)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2004-11-30 15:52:46 UTC (rev 4018)
@@ -259,8 +259,6 @@
 		reload_services(True);
 		reopen_logs();
 
-		claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_PRINT_GENERAL);
-
 		already_got_session = True;
 		break;
 		

Modified: branches/SAMBA_3_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/server.c	2004-11-30 06:41:45 UTC (rev 4017)
+++ branches/SAMBA_3_0/source/smbd/server.c	2004-11-30 15:52:46 UTC (rev 4018)
@@ -864,7 +864,7 @@
 	   smbd is launched via inetd and we fork a copy of 
 	   ourselves here */
 
-	if ( is_daemon )
+	if ( is_daemon && !interactive )
 		start_background_queue(); 
 
 	if (!open_sockets_smbd(is_daemon, interactive, ports))