diff options
| author | Luk Claes <luk@debian.org> | 2012-05-10 18:34:40 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-12 00:45:21 +0200 |
| commit | 87d890fdd92195acca3e099c3f7b60aea91ac04e (patch) | |
| tree | aa4634437342c38fc9f68608a718975a44678c54 /source3/libsmb/smb2cli_create.c | |
| parent | f6db3d7bef750d48079ff56535f48c9923e5f4c8 (diff) | |
| download | samba-87d890fdd92195acca3e099c3f7b60aea91ac04e.tar.gz samba-87d890fdd92195acca3e099c3f7b60aea91ac04e.tar.bz2 samba-87d890fdd92195acca3e099c3f7b60aea91ac04e.zip | |
s3/libsmb: Generalise cli_state in smb2 create calls
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb/smb2cli_create.c')
| -rw-r--r-- | source3/libsmb/smb2cli_create.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/source3/libsmb/smb2cli_create.c b/source3/libsmb/smb2cli_create.c index 4fa782f2ae..f4fa45a46a 100644 --- a/source3/libsmb/smb2cli_create.c +++ b/source3/libsmb/smb2cli_create.c @@ -48,7 +48,10 @@ static void smb2cli_create_done(struct tevent_req *subreq); struct tevent_req *smb2cli_create_send( TALLOC_CTX *mem_ctx, struct tevent_context *ev, - struct cli_state *cli, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + uint32_t tcon_id, const char *filename, uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ @@ -136,12 +139,12 @@ struct tevent_req *smb2cli_create_send( data_blob_free(&blob); } - subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_CREATE, + subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_CREATE, 0, 0, /* flags */ - cli->timeout, - cli->smb2.pid, - cli->smb2.tid, - cli->smb2.session, + timeout_msec, + 0xFEFF, /* pid */ + tcon_id, + session, state->fixed, sizeof(state->fixed), dyn, dyn_len); if (tevent_req_nomem(subreq, req)) { @@ -227,7 +230,10 @@ NTSTATUS smb2cli_create_recv(struct tevent_req *req, return NT_STATUS_OK; } -NTSTATUS smb2cli_create(struct cli_state *cli, +NTSTATUS smb2cli_create(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + uint32_t tcon_id, const char *filename, uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ @@ -245,7 +251,7 @@ NTSTATUS smb2cli_create(struct cli_state *cli, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - if (cli_has_async_calls(cli)) { + if (smbXcli_conn_has_async_calls(conn)) { /* * Can't use sync call while an async call is in flight */ @@ -256,7 +262,8 @@ NTSTATUS smb2cli_create(struct cli_state *cli, if (ev == NULL) { goto fail; } - req = smb2cli_create_send(frame, ev, cli, filename, oplock_level, + req = smb2cli_create_send(frame, ev, conn, timeout_msec, session, + tcon_id, filename, oplock_level, impersonation_level, desired_access, file_attributes, share_access, create_disposition, create_options, |