From 2900dfa5b928ef237e72ac4e15481e083d61750a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 May 2014 20:08:41 -0700 Subject: [PATCH] s3: client - rename 'struct smb2_create_returns' to 'struct smb_create_returns' so we can use this in SMB1 create returns as well. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- libcli/smb/smb2_create_blob.h | 2 +- libcli/smb/smb2cli_create.c | 6 +++--- libcli/smb/smbXcli_base.h | 6 +++--- source3/libsmb/cli_smb2_fnum.c | 4 ++-- source3/libsmb/cli_smb2_fnum.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libcli/smb/smb2_create_blob.h b/libcli/smb/smb2_create_blob.h index 2f915b3afe..90697a7089 100644 --- a/libcli/smb/smb2_create_blob.h +++ b/libcli/smb/smb2_create_blob.h @@ -33,7 +33,7 @@ struct smb2_create_blobs { struct smb2_create_blob *blobs; }; -struct smb2_create_returns { +struct smb_create_returns { uint8_t oplock_level; uint32_t create_action; NTTIME creation_time; diff --git a/libcli/smb/smb2cli_create.c b/libcli/smb/smb2cli_create.c index 9cb94b1196..834a88146c 100644 --- a/libcli/smb/smb2cli_create.c +++ b/libcli/smb/smb2cli_create.c @@ -29,7 +29,7 @@ struct smb2cli_create_state { uint64_t fid_persistent; uint64_t fid_volatile; - struct smb2_create_returns cr; + struct smb_create_returns cr; struct smb2_create_blobs blobs; }; @@ -225,7 +225,7 @@ static void smb2cli_create_done(struct tevent_req *subreq) NTSTATUS smb2cli_create_recv(struct tevent_req *req, uint64_t *fid_persistent, uint64_t *fid_volatile, - struct smb2_create_returns *cr) + struct smb_create_returns *cr) { struct smb2cli_create_state *state = tevent_req_data(req, @@ -258,7 +258,7 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn, struct smb2_create_blobs *blobs, uint64_t *fid_persistent, uint64_t *fid_volatile, - struct smb2_create_returns *cr) + struct smb_create_returns *cr) { TALLOC_CTX *frame = talloc_stackframe(); struct tevent_context *ev; diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 888242b112..8cde85e582 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -28,7 +28,7 @@ struct smb_trans_enc_state; struct GUID; struct iovec; struct smb2_create_blobs; -struct smb2_create_returns; +struct smb_create_returns; struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx, int fd, @@ -461,7 +461,7 @@ struct tevent_req *smb2cli_create_send( NTSTATUS smb2cli_create_recv(struct tevent_req *req, uint64_t *fid_persistent, uint64_t *fid_volatile, - struct smb2_create_returns *cr); + struct smb_create_returns *cr); NTSTATUS smb2cli_create(struct smbXcli_conn *conn, uint32_t timeout_msec, struct smbXcli_session *session, @@ -477,7 +477,7 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn, struct smb2_create_blobs *blobs, uint64_t *fid_persistent, uint64_t *fid_volatile, - struct smb2_create_returns *cr); + struct smb_create_returns *cr); struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c index 1e2047ef67..8eb776a132 100644 --- a/source3/libsmb/cli_smb2_fnum.c +++ b/source3/libsmb/cli_smb2_fnum.c @@ -163,7 +163,7 @@ NTSTATUS cli_smb2_create_fnum(struct cli_state *cli, uint32_t create_disposition, uint32_t create_options, uint16_t *pfid, - struct smb2_create_returns *cr) + struct smb_create_returns *cr) { NTSTATUS status; struct smb2_hnd h; @@ -660,7 +660,7 @@ NTSTATUS cli_smb2_qpathinfo_basic(struct cli_state *cli, uint32_t *attributes) { NTSTATUS status; - struct smb2_create_returns cr; + struct smb_create_returns cr; uint16_t fnum = 0xffff; size_t namelen = strlen(name); diff --git a/source3/libsmb/cli_smb2_fnum.h b/source3/libsmb/cli_smb2_fnum.h index a5cae25a2b..61a0f6851e 100644 --- a/source3/libsmb/cli_smb2_fnum.h +++ b/source3/libsmb/cli_smb2_fnum.h @@ -34,7 +34,7 @@ NTSTATUS cli_smb2_create_fnum(struct cli_state *cli, uint32_t create_disposition, uint32_t create_options, uint16_t *pfid, - struct smb2_create_returns *cr); + struct smb_create_returns *cr); NTSTATUS cli_smb2_close_fnum(struct cli_state *cli, uint16_t fnum); NTSTATUS cli_smb2_mkdir(struct cli_state *cli, const char *dirname); -- 2.34.1