summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-13 13:49:15 +0200
committerStefan Metzmacher <metze@samba.org>2011-09-13 18:12:22 +0200
commit80d2c2b00d2b8b7a5cb27ba60477cd8b994a869f (patch)
tree97060b04b062e9d29280598167f84c28733392d5
parentb7a1fd95a6fc4a3ff61bd83a5c2dc452f426f9f1 (diff)
downloadsamba-80d2c2b00d2b8b7a5cb27ba60477cd8b994a869f.tar.gz
samba-80d2c2b00d2b8b7a5cb27ba60477cd8b994a869f.tar.bz2
samba-80d2c2b00d2b8b7a5cb27ba60477cd8b994a869f.zip
s3:libsmb: don't mix smb2 share capabilities with smb1 capabilities
metze
-rw-r--r--source3/include/client.h1
-rw-r--r--source3/libsmb/smb2cli_tcon.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index cec6ba00de..3c39e5494b 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -170,6 +170,7 @@ struct cli_state {
/* SMB2 tcon */
uint8_t share_type;
uint32_t share_flags;
+ uint32_t share_capabilities;
uint32_t maximal_access;
} smb2;
};
diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c
index 8c2c802bdd..9cf73e3a4b 100644
--- a/source3/libsmb/smb2cli_tcon.c
+++ b/source3/libsmb/smb2cli_tcon.c
@@ -118,7 +118,7 @@ static void smb2cli_tcon_done(struct tevent_req *subreq)
body = (uint8_t *)iov[1].iov_base;
cli->smb2.share_type = CVAL(body, 2);
cli->smb2.share_flags = IVAL(body, 4);
- cli->capabilities = IVAL(body, 8);
+ cli->smb2.share_capabilities = IVAL(body, 8);
cli->smb2.maximal_access = IVAL(body, 12);
TALLOC_FREE(subreq);