diff options
| author | Jeremy Allison <jra@samba.org> | 2003-04-09 22:31:37 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-04-09 22:31:37 +0000 |
| commit | 045db5d0458b331e987d82d6e9a61a0b85957d17 (patch) | |
| tree | 875c013dbc6f8164ffa341e8b33e57da05be0e78 /source3/include/smb_macros.h | |
| parent | 0b11782f733db1d754d95ca03bb21550ab1156f1 (diff) | |
| download | samba-045db5d0458b331e987d82d6e9a61a0b85957d17.tar.gz samba-045db5d0458b331e987d82d6e9a61a0b85957d17.tar.bz2 samba-045db5d0458b331e987d82d6e9a61a0b85957d17.zip | |
Ensure we have WinXP-like semantics for checking TIDs and FIDs.
Jeremy.
(This used to be commit 52e44dde4ef9717eae7cf454f56d309fdd4b7d1f)
Diffstat (limited to 'source3/include/smb_macros.h')
| -rw-r--r-- | source3/include/smb_macros.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 999850b8eb..45fa23b87d 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -77,12 +77,15 @@ #define OPEN_CONN(conn) ((conn) && (conn)->open) #define IS_IPC(conn) ((conn) && (conn)->ipc) #define IS_PRINT(conn) ((conn) && (conn)->printer) -#define FNUM_OK(fsp,c) (OPEN_FSP(fsp) && (c)==(fsp)->conn) +#define FNUM_OK(fsp,c) (OPEN_FSP(fsp) && (c)==(fsp)->conn && current_user.vuid==(fsp)->vuid) -#define CHECK_FSP(fsp,conn) if (!FNUM_OK(fsp,conn)) \ +#define CHECK_FSP(fsp,conn) do {\ + extern struct current_user current_user;\ + if (!FNUM_OK(fsp,conn)) \ return(ERROR_DOS(ERRDOS,ERRbadfid)); \ else if((fsp)->fd == -1) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) + return(ERROR_DOS(ERRDOS,ERRbadaccess));\ + } while(0) #define CHECK_READ(fsp) if (!(fsp)->can_read) \ return(ERROR_DOS(ERRDOS,ERRbadaccess)) |