sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

Formatting fixes only.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent 3623fbb4f0
commit 27081355a9
2 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/smbd/close.c
View File

@ -166,21 +166,21 @@ static int close_normal_file(files_struct *fsp, BOOL normal_close)
* reference to a file.
*/
if (normal_close && delete_on_close) {
DEBUG(5,("close_file: file %s. Delete on close was set - deleting file.\n",
fsp->fsp_name));
if (normal_close && delete_on_close) {
DEBUG(5,("close_file: file %s. Delete on close was set - deleting file.\n",
fsp->fsp_name));
if(fsp->conn->vfs_ops.unlink(conn,fsp->fsp_name) != 0) {
/*
* This call can potentially fail as another smbd may have
* had the file open with delete on close set and deleted
* it when its last reference to this file went away. Hence
* we log this but not at debug level zero.
*/
/*
* This call can potentially fail as another smbd may have
* had the file open with delete on close set and deleted
* it when its last reference to this file went away. Hence
* we log this but not at debug level zero.
*/
DEBUG(5,("close_file: file %s. Delete on close was set and unlink failed \
DEBUG(5,("close_file: file %s. Delete on close was set and unlink failed \
with error %s\n", fsp->fsp_name, strerror(errno) ));
}
}
}
}
unlock_share_entry_fsp(fsp);
@ -238,7 +238,7 @@ static int close_directory(files_struct *fsp, BOOL normal_close)
if(ok)
remove_pending_change_notify_requests_by_filename(fsp);
}
}
/*
* Do the code common to files and directories.

87
source/smbd/nttrans.c
View File

@ -595,59 +595,58 @@ int reply_ntcreate_and_X(connection_struct *conn,
* Get the file name.
*/
if(root_dir_fid != 0) {
/*
* This filename is relative to a directory fid.
*/
files_struct *dir_fsp = file_fsp(inbuf,smb_ntcreate_RootDirectoryFid);
size_t dir_name_len;
if(root_dir_fid != 0) {
/*
* This filename is relative to a directory fid.
*/
files_struct *dir_fsp = file_fsp(inbuf,smb_ntcreate_RootDirectoryFid);
size_t dir_name_len;
if(!dir_fsp) {
END_PROFILE(SMBntcreateX);
return(ERROR_DOS(ERRDOS,ERRbadfid));
}
if(!dir_fsp) {
END_PROFILE(SMBntcreateX);
return(ERROR_DOS(ERRDOS,ERRbadfid));
}
if(!dir_fsp->is_directory) {
/*
* Check to see if this is a mac fork of some kind.
*/
if(!dir_fsp->is_directory) {
/*
* Check to see if this is a mac fork of some kind.
*/
srvstr_pull(inbuf, fname, smb_buf(inbuf), sizeof(fname), -1, STR_TERMINATE);
srvstr_pull(inbuf, fname, smb_buf(inbuf), sizeof(fname), -1, STR_TERMINATE);
if( strchr_m(fname, ':')) {
END_PROFILE(SMBntcreateX);
return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
}
END_PROFILE(SMBntcreateX);
return(ERROR_DOS(ERRDOS,ERRbadfid));
}
if( strchr_m(fname, ':')) {
END_PROFILE(SMBntcreateX);
return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
}
END_PROFILE(SMBntcreateX);
return(ERROR_DOS(ERRDOS,ERRbadfid));
}
/*
* Copy in the base directory name.
*/
/*
* Copy in the base directory name.
*/
pstrcpy( fname, dir_fsp->fsp_name );
dir_name_len = strlen(fname);
pstrcpy( fname, dir_fsp->fsp_name );
dir_name_len = strlen(fname);
/*
* Ensure it ends in a '\'.
*/
/*
* Ensure it ends in a '\'.
*/
if(fname[dir_name_len-1] != '\\' && fname[dir_name_len-1] != '/') {
pstrcat(fname, "\\");
dir_name_len++;
}
if(fname[dir_name_len-1] != '\\' && fname[dir_name_len-1] != '/') {
pstrcat(fname, "\\");
dir_name_len++;
}
srvstr_pull(inbuf, &fname[dir_name_len], smb_buf(inbuf), sizeof(fname)-dir_name_len,
-1, STR_TERMINATE);
} else {
srvstr_pull(inbuf, fname, smb_buf(inbuf), sizeof(fname),
-1, STR_TERMINATE);
}
srvstr_pull(inbuf, &fname[dir_name_len], smb_buf(inbuf), sizeof(fname)-dir_name_len,
-1, STR_TERMINATE);
} else {
srvstr_pull(inbuf, fname, smb_buf(inbuf), sizeof(fname), -1, STR_TERMINATE);
}
/*
* Now contruct the smb_open_mode value from the filename,
* desired access and the share access.
* desired access and the share access.
*/
RESOLVE_DFSPATH(fname, conn, inbuf, outbuf);
@ -829,10 +828,10 @@ int reply_ntcreate_and_X(connection_struct *conn,
* exclusive & batch here.
*/
if (smb_action & EXTENDED_OPLOCK_GRANTED)
SCVAL(p,0, BATCH_OPLOCK_RETURN);
if (smb_action & EXTENDED_OPLOCK_GRANTED)
SCVAL(p,0, BATCH_OPLOCK_RETURN);
else if (LEVEL_II_OPLOCK_TYPE(fsp->oplock_type))
SCVAL(p,0, LEVEL_II_OPLOCK_RETURN);
SCVAL(p,0, LEVEL_II_OPLOCK_RETURN);
else
SCVAL(p,0,NO_OPLOCK_RETURN);