s3: smbd: Rename srv_set_message() -> srv_smb1_set_message().

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

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 542d2ecc9421b21b8e701e4a0b1312af2a5be86c..fa634c0d19b420790a747ba456e4c8b4774bb9ab 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -115,7 +115,7 @@ void error_packet_set(char *outbuf, uint8_t eclass, uint32_t ecode, NTSTATUS nts
 
 size_t error_packet(char *outbuf, uint8_t eclass, uint32_t ecode, NTSTATUS ntstatus, int line, const char *file)
 {
-       size_t outsize = srv_set_message(outbuf,0,0,True);
+       size_t outsize = srv_smb1_set_message(outbuf,0,0,True);
        error_packet_set(outbuf, eclass, ecode, ntstatus, line, file);
        return outsize;
 }

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 134d81906031158ab3d878f44ef330282fec9869..45fe96fb8603d19109be0cf9f7bcbfb30b8acfd1 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -857,7 +857,7 @@ bool smb1_srv_send(struct smbXsrv_connection *xconn, char *buffer,
                   bool do_encrypt,
                   struct smb_perfcount_data *pcd);
 #endif
-size_t srv_set_message(char *buf,
+size_t srv_smb1_set_message(char *buf,
                       size_t num_words,
                       size_t num_bytes,
                       bool zero);

diff --git a/source3/smbd/smb1_aio.c b/source3/smbd/smb1_aio.c
index 6138646506e883b743fad4d3ec9d380c96450dbe..eab817ca14834732d9b5276b0e9eebc4304d727a 100644 (file)
--- a/source3/smbd/smb1_aio.c
+++ b/source3/smbd/smb1_aio.c
@@ -77,7 +77,7 @@ NTSTATUS schedule_aio_read_and_X(connection_struct *conn,
        }
 
        construct_reply_common_req(smbreq, (char *)aio_ex->outbuf.data);
-       srv_set_message((char *)aio_ex->outbuf.data, 12, 0, True);
+       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 */
 
@@ -156,7 +156,7 @@ static void aio_pread_smb1_done(struct tevent_req *req)
                           strerror(vfs_aio_state.error)));
 
                ERROR_NT(map_nt_error_from_unix(vfs_aio_state.error));
-               outsize = srv_set_message(outbuf,0,0,true);
+               outsize = srv_smb1_set_message(outbuf,0,0,true);
        } else {
                outsize = setup_readX_header(outbuf, nread);
 
@@ -240,7 +240,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);
-       srv_set_message((char *)aio_ex->outbuf.data, 6, 0, True);
+       srv_smb1_set_message((char *)aio_ex->outbuf.data, 6, 0, True);
        SCVAL(aio_ex->outbuf.data,smb_vwv0,0xFF); /* Never a chained reply. */
 
        init_strict_lock_struct(fsp,
@@ -373,7 +373,7 @@ static void aio_pwrite_smb1_done(struct tevent_req *req)
                          (int)nwritten, strerror(err)));
 
                ERROR_NT(map_nt_error_from_unix(err));
-               srv_set_message(outbuf,0,0,true);
+               srv_smb1_set_message(outbuf,0,0,true);
         } else {
                SSVAL(outbuf,smb_vwv2,nwritten);
                SSVAL(outbuf,smb_vwv4,(nwritten>>16)&1);

diff --git a/source3/smbd/smb1_oplock.c b/source3/smbd/smb1_oplock.c
index 75103031382032203ba088059b1e08c9c19fed86..6425eff67b295124929f5374115726f9f83686ad 100644 (file)
--- a/source3/smbd/smb1_oplock.c
+++ b/source3/smbd/smb1_oplock.c
@@ -36,7 +36,7 @@ void new_break_message_smb1(files_struct *fsp, int cmd,
                            char result[SMB1_BREAK_MESSAGE_LENGTH])
 {
        memset(result,'\0',smb_size);
-       srv_set_message(result,8,0,true);
+       srv_smb1_set_message(result,8,0,true);
        SCVAL(result,smb_com,SMBlockingX);
        SSVAL(result,smb_tid,fsp->conn->cnum);
        SSVAL(result,smb_pid,0xFFFF);

diff --git a/source3/smbd/smb1_pipes.c b/source3/smbd/smb1_pipes.c
index 64cd55f9568c6aae94d8caca366ed304b8dc73b0..b38ead1e132a084f7c70d754c02861894117552b 100644 (file)
--- a/source3/smbd/smb1_pipes.c
+++ b/source3/smbd/smb1_pipes.c
@@ -329,7 +329,7 @@ static void pipe_read_andx_done(struct tevent_req *subreq)
        req->outbuf = state->outbuf;
        state->outbuf = NULL;
 
-       srv_set_message((char *)req->outbuf, 12, nread + 1 /* padding byte */,
+       srv_smb1_set_message((char *)req->outbuf, 12, nread + 1 /* padding byte */,
                        false);
 
 #if 0

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index 0c7091592555c85d74132c2ef4070e1f897f92f2..052d19e2f249c53993e67b03a70cdf268b67b1c5 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -2861,7 +2861,7 @@ static void reply_lockread_locked(struct tevent_req *subreq)
                goto send;
        }
 
-       srv_set_message((char *)req->outbuf, 5, nread+3, False);
+       srv_smb1_set_message((char *)req->outbuf, 5, nread+3, False);
 
        SSVAL(req->outbuf,smb_vwv0,nread);
        SSVAL(req->outbuf,smb_vwv5,nread+3);
@@ -2969,7 +2969,7 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n",
                goto out;
        }
 
-       srv_set_message((char *)req->outbuf, 5, nread+3, False);
+       srv_smb1_set_message((char *)req->outbuf, 5, nread+3, False);
 
        SSVAL(req->outbuf,smb_vwv0,nread);
        SSVAL(req->outbuf,smb_vwv5,nread+3);
@@ -2992,7 +2992,7 @@ size_t setup_readX_header(char *outbuf, size_t smb_maxcnt)
 {
        size_t outsize;
 
-       outsize = srv_set_message(outbuf,12,smb_maxcnt + 1 /* padding byte */,
+       outsize = srv_smb1_set_message(outbuf,12,smb_maxcnt + 1 /* padding byte */,
                                  False);
 
        memset(outbuf+smb_vwv0,'\0',24); /* valgrind init. */
@@ -3600,7 +3600,7 @@ void reply_writebraw(struct smb_request *req)
         * it to send more bytes */
 
        memcpy(buf, req->inbuf, smb_size);
-       srv_set_message(buf,get_Protocol()>PROTOCOL_COREPLUS?1:0,0,True);
+       srv_smb1_set_message(buf,get_Protocol()>PROTOCOL_COREPLUS?1:0,0,True);
        SCVAL(buf,smb_com,SMBwritebraw);
        SSVALS(buf,smb_vwv0,0xFFFF);
        show_msg(buf);

diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index e726167d779119a68e5964fce546bcfc0929f666..47f7542a59e8bc6c7a4ebf4bb212d103f71279c2 100644 (file)
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -124,10 +124,10 @@ bool smb1_srv_send(struct smbXsrv_connection *xconn, char *buffer,
 #endif
 
 /*******************************************************************
- Setup the word count and byte count for a smb message.
+ Setup the word count and byte count for a smb1 message.
 ********************************************************************/
 
-size_t srv_set_message(char *buf,
+size_t srv_smb1_set_message(char *buf,
                       size_t num_words,
                       size_t num_bytes,
                       bool zero)
@@ -492,7 +492,7 @@ static void construct_reply_common(uint8_t cmd, const uint8_t *inbuf,
        out_flags2 |= in_flags2 & FLAGS2_SMB_SECURITY_SIGNATURES;
        out_flags2 |= in_flags2 & FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED;
 
-       srv_set_message(outbuf,0,0,false);
+       srv_smb1_set_message(outbuf,0,0,false);
 
        SCVAL(outbuf, smb_com, cmd);
        SIVAL(outbuf,smb_rcls,0);
@@ -546,7 +546,7 @@ bool create_outbuf(TALLOC_CTX *mem_ctx, struct smb_request *req,
        }
 
        construct_reply_common(req->cmd, inbuf, *outbuf);
-       srv_set_message(*outbuf, num_words, num_bytes, false);
+       srv_smb1_set_message(*outbuf, num_words, num_bytes, false);
        /*
         * Zero out the word area, the caller has to take care of the bcc area
         * himself