diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 3ebab18434..b99cb54840 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -4698,8 +4698,12 @@ int reply_mv(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, Copy a file as part of a reply_copy. ******************************************************************/ -BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, - int count,BOOL target_is_directory, int *err_ret) +/* + * TODO: check error codes on all callers + */ + +NTSTATUS copy_file(char *src, char *dest1,connection_struct *conn, int ofun, + int count, BOOL target_is_directory) { SMB_STRUCT_STAT src_sbuf, sbuf2; SMB_OFF_T ret=-1; @@ -4708,9 +4712,8 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, uint32 dosattrs; uint32 new_create_disposition; NTSTATUS status; + int close_err; - *err_ret = 0; - pstrcpy(dest,dest1); if (target_is_directory) { char *p = strrchr_m(src,'/'); @@ -4724,7 +4727,7 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, } if (!vfs_file_exist(conn,src,&src_sbuf)) { - return(False); + return NT_STATUS_OBJECT_NAME_NOT_FOUND; } if (!target_is_directory && count) { @@ -4732,7 +4735,7 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, } else { if (!map_open_params_to_ntcreate(dest1,0,ofun, NULL, NULL, &new_create_disposition, NULL)) { - return(False); + return NT_STATUS_INVALID_PARAMETER; } } @@ -4746,7 +4749,7 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, NULL, &fsp1); if (!NT_STATUS_IS_OK(status)) { - return(False); + return status; } dosattrs = dos_mode(conn, src, &src_sbuf); @@ -4765,7 +4768,7 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, if (!NT_STATUS_IS_OK(status)) { close_file(fsp1,ERROR_CLOSE); - return(False); + return status; } if ((ofun&3) == 1) { @@ -4794,9 +4797,17 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun, * Thus we don't look at the error return from the * close of fsp1. */ - *err_ret = close_file(fsp2,NORMAL_CLOSE); + close_err = close_file(fsp2,NORMAL_CLOSE); - return(ret == (SMB_OFF_T)src_sbuf.st_size); + if (close_err != 0) { + return map_nt_error_from_unix(close_err); + } + + if (ret != (SMB_OFF_T)src_sbuf.st_size) { + return NT_STATUS_DISK_FULL; + } + + return NT_STATUS_OK; } /**************************************************************************** @@ -4903,13 +4914,14 @@ int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, if (!has_wild) { pstrcat(directory,"/"); pstrcat(directory,mask); - if (resolve_wildcards(directory,newname) && - copy_file(directory,newname,conn,ofun, count,target_is_directory,&err)) + if (resolve_wildcards(directory,newname) + && NT_STATUS_IS_OK(status = copy_file( + directory,newname,conn,ofun, + count,target_is_directory))) count++; - if(!count && err) { - errno = err; + if(!count && !NT_STATUS_IS_OK(status)) { END_PROFILE(SMBcopy); - return(UNIXERROR(ERRHRD,ERRgeneral)); + return ERROR_NT(status); } if (!count) { exists = vfs_file_exist(conn,directory,NULL); @@ -4942,9 +4954,10 @@ int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, error = ERRnoaccess; slprintf(fname,sizeof(fname)-1, "%s/%s",directory,dname); pstrcpy(destname,newname); - if (resolve_wildcards(fname,destname) && - copy_file(fname,destname,conn,ofun, - count,target_is_directory,&err)) + if (resolve_wildcards(fname,destname) + && NT_STATUS_IS_OK(status = copy_file( + fname,destname,conn,ofun, + count,target_is_directory))) count++; DEBUG(3,("reply_copy : doing copy on %s -> %s\n",fname,destname)); } |