Author: jra Date: 2005-02-23 02:20:54 +0000 (Wed, 23 Feb 2005) New Revision: 5513
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5513 Log: Fix for bug #2201 - use same logic with "delete readonly" when setting the delete on close flag as we do in SMBunlink calls. Jeremy. Modified: branches/SAMBA_3_0/source/smbd/trans2.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/trans2.c =================================================================== --- branches/SAMBA_3_0/source/smbd/trans2.c 2005-02-23 02:20:54 UTC (rev 5512) +++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-02-23 02:20:54 UTC (rev 5513) @@ -2958,10 +2958,12 @@ * Only allow delete on close for writable files. */ - if (dosmode & aRONLY) { - DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but file attribute is readonly.\n", - fsp->fsp_name )); - return NT_STATUS_CANNOT_DELETE; + if (!lp_delete_readonly(SNUM(fsp->conn))) { + if (dosmode & aRONLY) { + DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but file attribute is readonly.\n", + fsp->fsp_name )); + return NT_STATUS_CANNOT_DELETE; + } } /*
