summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-08-07 16:17:12 -0700
committerStefan Metzmacher <metze@samba.org>2013-08-15 09:07:07 +0200
commitc6ed0b88312d7e231749a09a87944caea4c9808e (patch)
treeded317bf8301b6be1d0f7abf42307614a7ee6bc4
parent75d2e18502ccb811c018535f3c5c7325bdf5e613 (diff)
downloadsamba-c6ed0b88312d7e231749a09a87944caea4c9808e.tar.gz
samba-c6ed0b88312d7e231749a09a87944caea4c9808e.tar.bz2
samba-c6ed0b88312d7e231749a09a87944caea4c9808e.zip
s3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/libsmb/clifile.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f67411856b..77796d883c 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4034,11 +4034,17 @@ NTSTATUS cli_dskattr_recv(struct tevent_req *req, int *bsize, int *total, int *a
NTSTATUS cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
{
- TALLOC_CTX *frame = talloc_stackframe();
+ TALLOC_CTX *frame = NULL;
struct tevent_context *ev = NULL;
struct tevent_req *req = NULL;
NTSTATUS status = NT_STATUS_OK;
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ return cli_smb2_dskattr(cli, bsize, total, avail);
+ }
+
+ frame = talloc_stackframe();
+
if (smbXcli_conn_has_async_calls(cli->conn)) {
/*
* Can't use sync call while an async call is in flight