svn commit: samba r11292 - branches/SAMBA_3_0/source/rpc_server trunk/source/rpc_server

jerry at samba.org jerry at samba.org
Tue Oct 25 12:49:25 GMT 2005


Author: jerry
Date: 2005-10-25 12:49:24 +0000 (Tue, 25 Oct 2005)
New Revision: 11292

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

Log:
Missed merge from Samba 2.2 many years ago....

Don't count open pipes in the num_files_open on a connection.
conn_idle_all() handles this by looking for open rpc handles
If there are no open handles, we can close the IPC$ share.


Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c
   trunk/source/rpc_server/srv_pipe_hnd.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c	2005-10-25 12:39:14 UTC (rev 11291)
+++ branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c	2005-10-25 12:49:24 UTC (rev 11292)
@@ -337,9 +337,6 @@
 
 	p->conn = conn;
 
-	/* Ensure the connection isn't idled whilst this pipe is open. */
-	p->conn->num_files_open++;
-
 	p->vuid  = vuid;
 
 	p->endian = RPC_LITTLE_ENDIAN;
@@ -1156,8 +1153,6 @@
 
 	DLIST_REMOVE(InternalPipes, p);
 
-	p->conn->num_files_open--;
-
 	ZERO_STRUCTP(p);
 
 	SAFE_FREE(p);

Modified: trunk/source/rpc_server/srv_pipe_hnd.c
===================================================================
--- trunk/source/rpc_server/srv_pipe_hnd.c	2005-10-25 12:39:14 UTC (rev 11291)
+++ trunk/source/rpc_server/srv_pipe_hnd.c	2005-10-25 12:49:24 UTC (rev 11292)
@@ -337,9 +337,6 @@
 
 	p->conn = conn;
 
-	/* Ensure the connection isn't idled whilst this pipe is open. */
-	p->conn->num_files_open++;
-
 	p->vuid  = vuid;
 
 	p->endian = RPC_LITTLE_ENDIAN;
@@ -1156,8 +1153,6 @@
 
 	DLIST_REMOVE(InternalPipes, p);
 
-	p->conn->num_files_open--;
-
 	ZERO_STRUCTP(p);
 
 	SAFE_FREE(p);



More information about the samba-cvs mailing list