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

Added fixes to return correct error codes on space allocation fail.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent d1e7cf6073
commit 3bf2419f4b
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/smbd/reply.c
View File

@ -2442,8 +2442,32 @@ int reply_writeunlock(connection_struct *conn, char *inbuf,char *outbuf, int siz
}
/****************************************************************************
reply to a write
Return correct error for space allocation fail.
****************************************************************************/
int allocate_space_error(char *inbuf,char *outbuf, int errno_val)
{
errno = errno_val;
if (!(global_client_caps & CAP_STATUS32))
return (UNIXERROR(ERRHRD,ERRdiskfull));
/* Use more specific WNT/W2K error codes. */
#ifdef EDQUOT
if (errno_val == ENOSPC || errno_val == EDQUOT) {
#else
if (errno_val == ENOSPC) {
#endif
SSVAL(outbuf,smb_flg2,SVAL(outbuf, smb_flg2) | FLAGS2_32_BIT_ERROR_CODES);
return(ERROR(0,errno == ENOSPC ? NT_STATUS_DISK_FULL : NT_STATUS_QUOTA_EXCEEDED));
}
return (UNIXERROR(ERRHRD,ERRdiskfull));
}
/****************************************************************************
Reply to a write.
****************************************************************************/
int reply_write(connection_struct *conn, char *inbuf,char *outbuf,int size,int dum_buffsize)
{
size_t numtowrite;
@ -2479,6 +2503,11 @@ int reply_write(connection_struct *conn, char *inbuf,char *outbuf,int size,int d
if(numtowrite == 0) {
/* This is actually an allocate call, not set EOF. JRA */
nwritten = vfs_allocate_file_space(fsp, (SMB_OFF_T)startpos);
if (nwritten < 0) {
int ret = allocate_space_error(inbuf, outbuf, errno);
END_PROFILE(SMBwrite);
return ret;
}
} else
nwritten = write_file(fsp,data,startpos,numtowrite);

2
source/smbd/trans2.c
View File

@ -1928,7 +1928,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
}
if (ret == -1)
return(UNIXERROR(ERRHRD,ERRdiskfull));
return allocate_space_error(inbuf, outbuf, errno);
sbuf.st_size = size;
break;