svn commit: samba r21274 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_25/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-02-11 04:37:56 +0000 (Sun, 11 Feb 2007)
New Revision: 21274

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

Log:
As we now have POSIX opens which can unlink
with other open files we may have taken
the delete code path with more than one share mode
entry - ensure we only delete once by resetting
the delete on close flag.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/close.c
   branches/SAMBA_3_0_25/source/smbd/close.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/close.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/close.c	2007-02-10 20:29:09 UTC (rev 21273)
+++ branches/SAMBA_3_0/source/smbd/close.c	2007-02-11 04:37:56 UTC (rev 21274)
@@ -287,6 +287,15 @@
 		status = map_nt_error_from_unix(errno);
 	}
 
+	/* As we now have POSIX opens which can unlink
+ 	 * with other open files we may have taken
+ 	 * this code path with more than one share mode
+ 	 * entry - ensure we only delete once by resetting
+ 	 * the delete on close flag. JRA.
+ 	 */
+
+	set_delete_on_close_lck(lck, False, NULL);
+
  done:
 
 	/* unbecome user. */

Modified: branches/SAMBA_3_0_25/source/smbd/close.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/close.c	2007-02-10 20:29:09 UTC (rev 21273)
+++ branches/SAMBA_3_0_25/source/smbd/close.c	2007-02-11 04:37:56 UTC (rev 21274)
@@ -287,6 +287,15 @@
 		status = map_nt_error_from_unix(errno);
 	}
 
+	/* As we now have POSIX opens which can unlink
+ 	 * with other open files we may have taken
+ 	 * this code path with more than one share mode
+ 	 * entry - ensure we only delete once by resetting
+ 	 * the delete on close flag. JRA.
+ 	 */
+
+	set_delete_on_close_lck(lck, False, NULL);
+
  done:
 
 	/* unbecome user. */