s3/libsmb: Generalise cli_state in smb2 query_directory calls

[obnox/samba/samba-obnox.git] / source3 / torture / test_smb2.c

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index a8f7cd421e973e4cdc5b8fdd1aa44d6de3ad17a7..8ce0ad84e73262cd32ed0f518796dd01a414b3c3 100644 (file)
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -151,7 +151,8 @@ bool run_smb2_basic(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -1485,7 +1486,8 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0x3, 0, dir_persistent, dir_volatile,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1579,7 +1581,8 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0x3, 0, dir_persistent, dir_volatile,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1830,7 +1833,8 @@ bool run_smb2_session_reauth(int dummy)
        }
 
        status = smb2cli_query_directory(
-               cli, 1, 0x3, 0, dir_persistent, dir_volatile,
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
+               1, 0x3, 0, dir_persistent, dir_volatile,
                "session-reauth.txt", 0xffff,
                talloc_tos(), &dir_data, &dir_data_length);
        if (!NT_STATUS_IS_OK(status)) {