Author: jra Date: 2007-07-17 05:55:10 +0000 (Tue, 17 Jul 2007) New Revision: 23913
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23913 Log: Revert back to Volker's original logic to fix the RAW-SFILEINFO-RENAME until I can figure out what is different from the way CIFSFS drives this in the cthon tests and the way smbtorture drives it. Jeremy. Modified: branches/SAMBA_3_2/source/smbd/reply.c branches/SAMBA_3_2_0/source/smbd/reply.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/reply.c =================================================================== --- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 05:40:36 UTC (rev 23912) +++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 05:55:10 UTC (rev 23913) @@ -4449,7 +4449,7 @@ if (dst_exists) { files_struct *dst_fsp = file_find_di_first(file_id_sbuf(&sbuf1)); - if (dst_fsp && !(dst_fsp->share_access & FILE_SHARE_DELETE)) { + if (dst_fsp) { DEBUG(3, ("rename_internals_fsp: Target file open\n")); return NT_STATUS_ACCESS_DENIED; } Modified: branches/SAMBA_3_2_0/source/smbd/reply.c =================================================================== --- branches/SAMBA_3_2_0/source/smbd/reply.c 2007-07-17 05:40:36 UTC (rev 23912) +++ branches/SAMBA_3_2_0/source/smbd/reply.c 2007-07-17 05:55:10 UTC (rev 23913) @@ -4447,7 +4447,7 @@ if (dst_exists) { files_struct *dst_fsp = file_find_di_first(file_id_sbuf(&sbuf1)); - if (dst_fsp && !(dst_fsp->share_access & FILE_SHARE_DELETE)) { + if (dst_fsp) { DEBUG(3, ("rename_internals_fsp: Target file open\n")); return NT_STATUS_ACCESS_DENIED; }
