sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r20544: Change copy_file() to return NTSTATUS. This is in preparation of turning

Browse Source 
close_file() to NTSTATUS as well.

I'm not sure I got all the error codes right, but as I've never come across a
smb_copy() call in all my Samba work, I'm leaving it at that. If I'm
absolutely bored, I will write a thorough torture test.

As far as I can see, Samba4 even does not have a libcli implementation for
it...  :-)

Volker
(This used to be commit 5ebdf02ba166df69e210e6f70c01a44e6205ecc1)
This commit is contained in:
Volker Lendecke 2007-01-05 13:13:15 +00:00 committed by Gerald (Jerry) Carter
parent 84da72860e
commit 1307337aaf
2 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/printing/nt_printing.c
View File

@ -1746,7 +1746,6 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract
SMB_STRUCT_STAT st; SMB_STRUCT_STAT st;
int ver = 0; int ver = 0;
int i; int i;
int err;
memset(inbuf, '\0', sizeof(inbuf)); memset(inbuf, '\0', sizeof(inbuf));
memset(outbuf, '\0', sizeof(outbuf)); memset(outbuf, '\0', sizeof(outbuf));
@ -1826,8 +1825,8 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract
slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->driverpath); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->driverpath);
if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
driver_unix_convert(new_name, conn, NULL, &bad_path, &st); driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE| if ( !NT_STATUS_IS_OK(copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False))) {
DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
new_name, old_name)); new_name, old_name));
*perr = WERR_ACCESS_DENIED; *perr = WERR_ACCESS_DENIED;
@ -1842,8 +1841,8 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract
slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->datafile); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->datafile);
if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
driver_unix_convert(new_name, conn, NULL, &bad_path, &st); driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE| if ( !NT_STATUS_IS_OK(copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False))) {
DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
new_name, old_name)); new_name, old_name));
*perr = WERR_ACCESS_DENIED; *perr = WERR_ACCESS_DENIED;
@ -1860,8 +1859,8 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract
slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->configfile); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->configfile);
if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
driver_unix_convert(new_name, conn, NULL, &bad_path, &st); driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE| if ( !NT_STATUS_IS_OK(copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False))) {
DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
new_name, old_name)); new_name, old_name));
*perr = WERR_ACCESS_DENIED; *perr = WERR_ACCESS_DENIED;
@ -1879,8 +1878,8 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract
slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->helpfile); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->helpfile);
if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
driver_unix_convert(new_name, conn, NULL, &bad_path, &st); driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE| if ( !NT_STATUS_IS_OK(copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False))) {
DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
new_name, old_name)); new_name, old_name));
*perr = WERR_ACCESS_DENIED; *perr = WERR_ACCESS_DENIED;
@ -1907,9 +1906,9 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract
slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->dependentfiles[i]); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->dependentfiles[i]);
if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
driver_unix_convert(new_name, conn, NULL, &bad_path, &st); driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
if ( !copy_file(new_name, old_name, conn, if ( !NT_STATUS_IS_OK(copy_file(new_name, old_name, conn,
OPENX_FILE_EXISTS_TRUNCATE| OPENX_FILE_EXISTS_TRUNCATE|
OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False))) {
DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
new_name, old_name)); new_name, old_name));
*perr = WERR_ACCESS_DENIED; *perr = WERR_ACCESS_DENIED;

49
source3/smbd/reply.c
View File

@ -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. 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_STRUCT_STAT src_sbuf, sbuf2;
SMB_OFF_T ret=-1; SMB_OFF_T ret=-1;
@ -4708,9 +4712,8 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
uint32 dosattrs; uint32 dosattrs;
uint32 new_create_disposition; uint32 new_create_disposition;
NTSTATUS status; NTSTATUS status;
int close_err;
*err_ret = 0;
pstrcpy(dest,dest1); pstrcpy(dest,dest1);
if (target_is_directory) { if (target_is_directory) {
char *p = strrchr_m(src,'/'); 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)) { if (!vfs_file_exist(conn,src,&src_sbuf)) {
return(False); return NT_STATUS_OBJECT_NAME_NOT_FOUND;
} }
if (!target_is_directory && count) { if (!target_is_directory && count) {
@ -4732,7 +4735,7 @@ BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
} else { } else {
if (!map_open_params_to_ntcreate(dest1,0,ofun, if (!map_open_params_to_ntcreate(dest1,0,ofun,
NULL, NULL, &new_create_disposition, NULL)) { 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); NULL, &fsp1);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
return(False); return status;
} }
dosattrs = dos_mode(conn, src, &src_sbuf); 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)) { if (!NT_STATUS_IS_OK(status)) {
close_file(fsp1,ERROR_CLOSE); close_file(fsp1,ERROR_CLOSE);
return(False); return status;
} }
if ((ofun&3) == 1) { 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 * Thus we don't look at the error return from the
* close of fsp1. * 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) { if (!has_wild) {
pstrcat(directory,"/"); pstrcat(directory,"/");
pstrcat(directory,mask); pstrcat(directory,mask);
if (resolve_wildcards(directory,newname) && if (resolve_wildcards(directory,newname)
copy_file(directory,newname,conn,ofun, count,target_is_directory,&err)) && NT_STATUS_IS_OK(status = copy_file(
directory,newname,conn,ofun,
count,target_is_directory)))
count++; count++;
if(!count && err) { if(!count && !NT_STATUS_IS_OK(status)) {
errno = err;
END_PROFILE(SMBcopy); END_PROFILE(SMBcopy);
return(UNIXERROR(ERRHRD,ERRgeneral)); return ERROR_NT(status);
} }
if (!count) { if (!count) {
exists = vfs_file_exist(conn,directory,NULL); 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; error = ERRnoaccess;
slprintf(fname,sizeof(fname)-1, "%s/%s",directory,dname); slprintf(fname,sizeof(fname)-1, "%s/%s",directory,dname);
pstrcpy(destname,newname); pstrcpy(destname,newname);
if (resolve_wildcards(fname,destname) && if (resolve_wildcards(fname,destname)
copy_file(fname,destname,conn,ofun, && NT_STATUS_IS_OK(status = copy_file(
count,target_is_directory,&err)) fname,destname,conn,ofun,
count,target_is_directory)))
count++; count++;
DEBUG(3,("reply_copy : doing copy on %s -> %s\n",fname,destname)); DEBUG(3,("reply_copy : doing copy on %s -> %s\n",fname,destname));
} }