diff options
| author | Jeremy Allison <jra@samba.org> | 2014-06-04 14:19:30 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-06-07 03:15:14 +0200 |
| commit | d0a7d7e87ece03a63840b0f143502075d6fa5527 (patch) | |
| tree | b7818a32389d58dd693d08cb54190ca16f38cbd5 /source3/libsmb/clifile.c | |
| parent | 66a04ba7c115d3be111296000e93cc18a1a05ef6 (diff) | |
| download | samba-d0a7d7e87ece03a63840b0f143502075d6fa5527.tar.gz samba-d0a7d7e87ece03a63840b0f143502075d6fa5527.tar.xz samba-d0a7d7e87ece03a63840b0f143502075d6fa5527.zip | |
s3: libsmb: Make cli_smb2_dskattr() a 64-bit interface.
Remove the fallback call from cli_dskattr() (now it's
not called from external client code).
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
Diffstat (limited to 'source3/libsmb/clifile.c')
| -rw-r--r-- | source3/libsmb/clifile.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 8bb1512f78..18ed5297b7 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -4094,10 +4094,6 @@ NTSTATUS cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail) 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)) { @@ -4138,11 +4134,11 @@ NTSTATUS cli_disk_size(struct cli_state *cli, uint64_t *bsize, uint64_t *total, NTSTATUS status; if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) { - status = cli_smb2_dskattr(cli, &old_bsize, &old_total, &old_avail); - } else { - status = cli_dskattr(cli, &old_bsize, &old_total, &old_avail); + return cli_smb2_dskattr(cli, bsize, total, avail); } + /* Old SMB1 core protocol fallback. */ + status = cli_dskattr(cli, &old_bsize, &old_total, &old_avail); if (!NT_STATUS_IS_OK(status)) { return status; } |