summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-01-08 23:49:37 +0000
committerJeremy Allison <jra@samba.org>2003-01-08 23:49:37 +0000
commit619fcbdb68f509834a4b4b03cb5444d843af1e89 (patch)
tree290f20b2633c80886f0fcecec015b6745648b1bd
parent65195b4d5489645edfbda7ff3230cc9fdb975fa6 (diff)
downloadsamba-619fcbdb68f509834a4b4b03cb5444d843af1e89.tar.gz
samba-619fcbdb68f509834a4b4b03cb5444d843af1e89.tar.bz2
samba-619fcbdb68f509834a4b4b03cb5444d843af1e89.zip
Ensure we return disk full by default on short writes.
Jeremy. (This used to be commit 6a2b7fd82c868d517301f8566cd86e9e4b31546f)
-rw-r--r--source3/smbd/reply.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index beccc1bba6..ef5a090243 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2011,7 +2011,7 @@ int reply_writeunlock(connection_struct *conn, char *inbuf,char *outbuf,
if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
END_PROFILE(SMBwriteunlock);
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ return(UNIXERROR(ERRHRD,ERRdiskfull));
}
status = do_unlock(fsp, conn, SVAL(inbuf,smb_pid), (SMB_BIG_UINT)numtowrite,
@@ -2092,7 +2092,7 @@ int reply_write(connection_struct *conn, char *inbuf,char *outbuf,int size,int d
if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
END_PROFILE(SMBwrite);
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ return(UNIXERROR(ERRHRD,ERRdiskfull));
}
outsize = set_message(outbuf,1,0,True);
@@ -2187,7 +2187,7 @@ int reply_write_and_X(connection_struct *conn, char *inbuf,char *outbuf,int leng
if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
END_PROFILE(SMBwriteX);
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ return(UNIXERROR(ERRHRD,ERRdiskfull));
}
set_message(outbuf,6,0,True);
@@ -2465,9 +2465,9 @@ int reply_writeclose(connection_struct *conn,
fsp->fnum, (int)numtowrite, (int)nwritten,
conn->num_files_open));
- if (nwritten <= 0) {
+ if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
END_PROFILE(SMBwriteclose);
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ return(UNIXERROR(ERRHRD,ERRdiskfull));
}
if(close_err != 0) {
@@ -2791,7 +2791,7 @@ int reply_printwrite(connection_struct *conn, char *inbuf,char *outbuf, int dum_
if (write_file(fsp,data,-1,numtowrite) != numtowrite) {
END_PROFILE(SMBsplwr);
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ return(UNIXERROR(ERRHRD,ERRdiskfull));
}
DEBUG( 3, ( "printwrite fnum=%d num=%d\n", fsp->fnum, numtowrite ) );