diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-09-13 15:00:59 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-09-15 12:12:23 +0200 |
commit | 595f0020d4bc6c43adf4e73021e5fffab3354bfd (patch) | |
tree | 4037a0f236d63fd649ba9650ebc144c75bb842c9 /source3/libsmb/cliconnect.c | |
parent | 74a581afe55d54090d46aa60b6377b930f11a76f (diff) | |
download | samba-595f0020d4bc6c43adf4e73021e5fffab3354bfd.tar.gz samba-595f0020d4bc6c43adf4e73021e5fffab3354bfd.tar.bz2 samba-595f0020d4bc6c43adf4e73021e5fffab3354bfd.zip |
s3:libsmb: move cli->capabilities to cli->conn.smb1.capabilities
And keep cli->conn.smb1.client.capabilities and
cli->conn.smb1.server_capabilities.
metze
Diffstat (limited to 'source3/libsmb/cliconnect.c')
-rw-r--r-- | source3/libsmb/cliconnect.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index e2e7ffd449..6e34c3d622 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -2607,8 +2607,10 @@ static void cli_negprot_done(struct tevent_req *subreq) NTSTATUS status; uint16_t protnum; uint8_t *inbuf; + uint32_t client_capabilities = cli->conn.smb1.client.capabilities; uint32_t both_capabilities; uint32_t server_capabilities = 0; + uint32_t capabilities; enum protocol_types protocol; status = cli_smb_recv(subreq, state, &inbuf, 1, &wct, &vwv, @@ -2751,13 +2753,16 @@ static void cli_negprot_done(struct tevent_req *subreq) * - flags used in both directions * - server only flags */ - both_capabilities = cli->capabilities & server_capabilities; - cli->capabilities = cli->capabilities & SMB_CAP_CLIENT_MASK; - cli->capabilities |= both_capabilities & SMB_CAP_BOTH_MASK; - cli->capabilities |= server_capabilities & SMB_CAP_SERVER_MASK; + both_capabilities = client_capabilities & server_capabilities; + capabilities = client_capabilities & SMB_CAP_CLIENT_MASK; + capabilities |= both_capabilities & SMB_CAP_BOTH_MASK; + capabilities |= server_capabilities & SMB_CAP_SERVER_MASK; cli->conn.protocol = protocol; + cli->conn.smb1.server.capabilities = server_capabilities; + cli->conn.smb1.capabilities = capabilities; + tevent_req_done(req); } |