s3: client - rename 'struct smb2_create_returns' to 'struct smb_create_returns' so...

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/libcli/smb/smb2_create_blob.h b/libcli/smb/smb2_create_blob.h
index 2f915b3afefed52cfaabfc7f6e7909de22889f0f..90697a70892726df76eff0fcb36f38e5b9226a78 100644 (file)
--- 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 9cb94b11962cc334b13252cf3e14a560e261fedf..834a88146ce3a46ef012d2323677ce5b0205b7d8 100644 (file)
--- 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 888242b1126bfcf8b322c050464065e070823fc3..8cde85e5827474b644fb60b45021cb0d6d0eb17d 100644 (file)
--- 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 1e2047ef6763e20cd72870ea2b4483838833589a..8eb776a13240d4f9139f18b56ce60ba429975628 100644 (file)
--- 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 a5cae25a2ba9772b455df9029ddea80acbaf79ac..61a0f6851eeebfed5f3e5dab2d2d1a1734879e24 100644 (file)
--- 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);