sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

libcli/smb: pass smbXcli_tcon to smb2cli_query_directory*()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2012-07-23 22:32:49 +02:00
parent 370e7140bb
commit 51af8b9600
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcli/smb/smb2cli_query_directory.c
View File

@ -38,7 +38,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
uint32_t tcon_id,
struct smbXcli_tcon *tcon,
uint8_t level,
uint8_t flags,
uint32_t file_index,
@ -52,6 +52,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
uint8_t *fixed;
uint8_t *dyn;
size_t dyn_len;
uint32_t tcon_id = 0;
req = tevent_req_create(mem_ctx, &state,
struct smb2cli_query_directory_state);
@ -87,6 +88,10 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
dyn_len = sizeof(state->dyn_pad);
}
if (tcon) {
tcon_id = smb2cli_tcon_current_id(tcon);
}
subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_FIND,
0, 0, /* flags */
timeout_msec,
@ -162,7 +167,7 @@ NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req,
NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
uint32_t tcon_id,
struct smbXcli_tcon *tcon,
uint8_t level,
uint8_t flags,
uint32_t file_index,
@ -191,7 +196,8 @@ NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
goto fail;
}
req = smb2cli_query_directory_send(frame, ev, conn, timeout_msec,
session, tcon_id, level, flags,
session, tcon,
level, flags,
file_index, fid_persistent,
fid_volatile, mask, outbuf_len);
if (req == NULL) {

4
libcli/smb/smbXcli_base.h
View File

@ -500,7 +500,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
uint32_t tcon_id,
struct smbXcli_tcon *tcon,
uint8_t level,
uint8_t flags,
uint32_t file_index,
@ -515,7 +515,7 @@ NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req,
NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
uint32_t tcon_id,
struct smbXcli_tcon *tcon,
uint8_t level,
uint8_t flags,
uint32_t file_index,

8
source3/torture/test_smb2.c
View File

@ -152,7 +152,7 @@ bool run_smb2_basic(int dummy)
}
status = smb2cli_query_directory(
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
talloc_tos(), &dir_data, &dir_data_length);
@ -1517,7 +1517,7 @@ bool run_smb2_session_reauth(int dummy)
}
status = smb2cli_query_directory(
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
1, 0x3, 0, dir_persistent, dir_volatile,
"session-reauth.txt", 0xffff,
talloc_tos(), &dir_data, &dir_data_length);
@ -1612,7 +1612,7 @@ bool run_smb2_session_reauth(int dummy)
}
status = smb2cli_query_directory(
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
1, 0x3, 0, dir_persistent, dir_volatile,
"session-reauth.txt", 0xffff,
talloc_tos(), &dir_data, &dir_data_length);
@ -1864,7 +1864,7 @@ bool run_smb2_session_reauth(int dummy)
}
status = smb2cli_query_directory(
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tid,
cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
1, 0x3, 0, dir_persistent, dir_volatile,
"session-reauth.txt", 0xffff,
talloc_tos(), &dir_data, &dir_data_length);