s3: smbd: Rename construct_reply_common_req() -> construct_smb1_reply_common_req()

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 45fe96fb8603d19109be0cf9f7bcbfb30b8acfd1..6096b198d4d6234e61991b19fcd255656e20b182 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -886,7 +886,7 @@ bool push_deferred_open_message_smb(struct smb_request *req,
 bool create_outbuf(TALLOC_CTX *mem_ctx, struct smb_request *req,
                    const uint8_t *inbuf, char **outbuf,
                    uint8_t num_words, uint32_t num_bytes);
-void construct_reply_common_req(struct smb_request *req, char *outbuf);
+void construct_smb1_reply_common_req(struct smb_request *req, char *outbuf);
 void reply_outbuf(struct smb_request *req, uint8_t num_words, uint32_t num_bytes);
 void process_smb(struct smbXsrv_connection *xconn,
                 uint8_t *inbuf, size_t nread, size_t unread_bytes,

diff --git a/source3/smbd/smb1_aio.c b/source3/smbd/smb1_aio.c
index eab817ca14834732d9b5276b0e9eebc4304d727a..8807fde42b3363d253b0dd8e86dc4c94d095fe7e 100644 (file)
--- a/source3/smbd/smb1_aio.c
+++ b/source3/smbd/smb1_aio.c
@@ -76,7 +76,7 @@ NTSTATUS schedule_aio_read_and_X(connection_struct *conn,
                return NT_STATUS_NO_MEMORY;
        }
 
-       construct_reply_common_req(smbreq, (char *)aio_ex->outbuf.data);
+       construct_smb1_reply_common_req(smbreq, (char *)aio_ex->outbuf.data);
        srv_smb1_set_message((char *)aio_ex->outbuf.data, 12, 0, True);
        SCVAL(aio_ex->outbuf.data,smb_vwv0,0xFF); /* Never a chained reply. */
        SCVAL(smb_buf(aio_ex->outbuf.data), 0, 0); /* padding byte */
@@ -239,7 +239,7 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn,
        }
        aio_ex->write_through = BITSETW(smbreq->vwv+7,0);
 
-       construct_reply_common_req(smbreq, (char *)aio_ex->outbuf.data);
+       construct_smb1_reply_common_req(smbreq, (char *)aio_ex->outbuf.data);
        srv_smb1_set_message((char *)aio_ex->outbuf.data, 6, 0, True);
        SCVAL(aio_ex->outbuf.data,smb_vwv0,0xFF); /* Never a chained reply. */
 

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index 052d19e2f249c53993e67b03a70cdf268b67b1c5..8827eacbb35baa129c2062b5c7f82c9866739577 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -3078,7 +3078,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
 
                header = data_blob_const(headerbuf, sizeof(headerbuf));
 
-               construct_reply_common_req(req, (char *)headerbuf);
+               construct_smb1_reply_common_req(req, (char *)headerbuf);
                setup_readX_header((char *)headerbuf, smb_maxcnt);
 
                nread = SMB_VFS_SENDFILE(xconn->transport.sock, fsp, &header,
@@ -3179,7 +3179,7 @@ normal_read:
                        goto nosendfile_read;
                }
 
-               construct_reply_common_req(req, (char *)headerbuf);
+               construct_smb1_reply_common_req(req, (char *)headerbuf);
                setup_readX_header((char *)headerbuf, smb_maxcnt);
 
                /* Send out the header. */

diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index fb642312413f311669bab7de9c230f7b06a868a7..0b050a21aaa31ff91ce522ba7ace4fa796389a91 100644 (file)
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -508,7 +508,7 @@ static void construct_smb1_reply_common(uint8_t cmd, const uint8_t *inbuf,
        SSVAL(outbuf,smb_mid,SVAL(inbuf,smb_mid));
 }
 
-void construct_reply_common_req(struct smb_request *req, char *outbuf)
+void construct_smb1_reply_common_req(struct smb_request *req, char *outbuf)
 {
        construct_smb1_reply_common(req->cmd, req->inbuf, outbuf);
 }