summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-04-12 01:25:10 +0000
committerJeremy Allison <jra@samba.org>2000-04-12 01:25:10 +0000
commitd2fff2596ad1585fc6a5e033fe8410fe5438a57b (patch)
tree3fbedb2b7d6c173d598c987b65e94431ed803cb1
parentfbfe94a799cda7f728bc920d4f0655d4f537e3b6 (diff)
downloadsamba-d2fff2596ad1585fc6a5e033fe8410fe5438a57b.tar.gz
samba-d2fff2596ad1585fc6a5e033fe8410fe5438a57b.tar.xz
samba-d2fff2596ad1585fc6a5e033fe8410fe5438a57b.zip
Ensure that CHECK_FNUM rejects fd == -1 correctly.
Jeremy.
-rw-r--r--source/include/smb_macros.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h
index 496787ee13f..cc9f158af88 100644
--- a/source/include/smb_macros.h
+++ b/source/include/smb_macros.h
@@ -80,7 +80,10 @@
#define FNUM_OK(fsp,c) (OPEN_FSP(fsp) && (c)==(fsp)->conn)
#define CHECK_FSP(fsp,conn) if (!FNUM_OK(fsp,conn)) \
- return(ERROR(ERRDOS,ERRbadfid))
+ return(ERROR(ERRDOS,ERRbadfid)); \
+ else if((fsp)->fd == -1) \
+ return(ERROR(ERRDOS,ERRbadaccess))
+
#define CHECK_READ(fsp) if (!(fsp)->can_read) \
return(ERROR(ERRDOS,ERRbadaccess))
#define CHECK_WRITE(fsp) if (!(fsp)->can_write) \