summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-04-08 22:15:55 -0700
committerJeremy Allison <jra@samba.org>2010-04-08 22:15:55 -0700
commit08b24e923dff99d3d3c0618903a7ed2959640470 (patch)
treeacfc07cc9c3aec2d1d78287b4fc58dbe143de627 /source3/include
parent3491f6d119d1f4c7e0a259a9993ce96783b77e23 (diff)
downloadsamba-08b24e923dff99d3d3c0618903a7ed2959640470.tar.gz
samba-08b24e923dff99d3d3c0618903a7ed2959640470.tar.bz2
samba-08b24e923dff99d3d3c0618903a7ed2959640470.zip
Stop smb2 from calling into smb1 blocking lock request code.
Allocate a uint16_t internal SMB1 mid for an SMB2 request. Add a back pointer from the faked up smb_request struct to the smb2 request. Getting ready to add restart code for blocking locks, share mode violations and oplocks in SMB2. Jeremy.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 751f3a46a4..48ab2f2283 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -623,6 +623,7 @@ struct current_user {
NT_USER_TOKEN *nt_user_token;
};
+struct smbd_smb2_request;
struct smb_request {
uint8_t cmd;
@@ -670,6 +671,11 @@ struct smb_request {
void *async_priv;
bool done;
+
+ /*
+ * Back pointer to smb2 request.
+ */
+ struct smbd_smb2_request *smb2req;
};
/* Defines for the sent_oplock_break field above. */