Author: vlendec Date: 2006-05-19 21:06:28 +0000 (Fri, 19 May 2006) New Revision: 15724
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15724 Log: Convert dup_file_fsp not to use set_saved_ntstatus Volker Modified: trunk/source/smbd/files.c trunk/source/smbd/open.c Changeset: Modified: trunk/source/smbd/files.c =================================================================== --- trunk/source/smbd/files.c 2006-05-19 20:57:10 UTC (rev 15723) +++ trunk/source/smbd/files.c 2006-05-19 21:06:28 UTC (rev 15724) @@ -522,10 +522,11 @@ Duplicate the file handle part for a DOS or FCB open. ****************************************************************************/ -files_struct *dup_file_fsp(files_struct *fsp, +NTSTATUS dup_file_fsp(files_struct *fsp, uint32 access_mask, uint32 share_access, - uint32 create_options) + uint32 create_options, + files_struct **result) { NTSTATUS status; files_struct *dup_fsp; @@ -533,8 +534,7 @@ status = file_new(fsp->conn, &dup_fsp); if (!NT_STATUS_IS_OK(status)) { - set_saved_ntstatus(status); - return NULL; + return status; } SAFE_FREE(dup_fsp->fh); @@ -569,5 +569,6 @@ dup_fsp->aio_write_behind = fsp->aio_write_behind; string_set(&dup_fsp->fsp_name,fsp->fsp_name); - return dup_fsp; + *result = dup_fsp; + return NT_STATUS_OK; } Modified: trunk/source/smbd/open.c =================================================================== --- trunk/source/smbd/open.c 2006-05-19 20:57:10 UTC (rev 15723) +++ trunk/source/smbd/open.c 2006-05-19 21:06:28 UTC (rev 15724) @@ -884,8 +884,8 @@ } /* We need to duplicate this fsp. */ - dup_fsp = dup_file_fsp(fsp, access_mask, share_access, create_options); - if (!dup_fsp) { + if (!NT_STATUS_IS_OK(dup_file_fsp(fsp, access_mask, share_access, + create_options, &dup_fsp))) { return NULL; }
