summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-05-17 23:15:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:06 -0500
commitcc9ea93456e594432e203e6d2d2f4dbcaac9a3dd (patch)
tree7bf722a9a742cf7986f31f454bfd17a4a8415ec0 /source3/include
parentc91a675ac108f48046ce72287c6d70a1a54ef65f (diff)
downloadsamba-cc9ea93456e594432e203e6d2d2f4dbcaac9a3dd.tar.gz
samba-cc9ea93456e594432e203e6d2d2f4dbcaac9a3dd.tar.bz2
samba-cc9ea93456e594432e203e6d2d2f4dbcaac9a3dd.zip
r15668: DOS or FCB opens share one share mode entry from different
fsp pointers. Ensure we cope with this to pass Samba4 DENY tests (we used to pass these, there must have been a regression with newer code). We now pass them. Jeremy (This used to be commit fd6fa1d4eaf61783df74ee2da50d331477f06998)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index fdeaaad651..f06c551cc0 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -404,6 +404,7 @@ struct fd_handle {
* DELETE_ON_CLOSE is not stored in the share
* mode database.
*/
+ unsigned long file_id;
};
struct timed_event;
@@ -438,7 +439,6 @@ typedef struct files_struct {
struct share_mode_entry *pending_break_messages;
int num_pending_break_messages;
- unsigned long file_id;
BOOL can_lock;
BOOL can_read;
BOOL can_write;