Remove a bunch of direct inbuf references by adding "buf" to smb_request

[abartlet/samba.git/.git] / source3 / smbd / message.c

diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 62df5c37ebfbb7a98af0e4350b99b5f2b6f800a0..6977b586dfa86387485d36bba69c3c1494b2b18e 100644 (file)
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -140,8 +140,8 @@ void reply_sends(struct smb_request *req)
 {
        struct msg_state *state;
        int len;
-       char *msg;
-       char *p;
+       const char *msg;
+       const char *p;
 
        START_PROFILE(SMBsends);
 
@@ -153,7 +153,7 @@ void reply_sends(struct smb_request *req)
 
        state = talloc(talloc_tos(), struct msg_state);
 
-       p = smb_buf(req->inbuf)+1;
+       p = (const char *)req->buf + 1;
        p += srvstr_pull_buf_talloc(
                state, (char *)req->inbuf, req->flags2, &state->from, p,
                STR_ASCII|STR_TERMINATE) + 1;
@@ -191,7 +191,7 @@ void reply_sends(struct smb_request *req)
 
 void reply_sendstrt(struct smb_request *req)
 {
-       char *p;
+       const char *p;
 
        START_PROFILE(SMBsendstrt);
 
@@ -211,7 +211,7 @@ void reply_sendstrt(struct smb_request *req)
                return;
        }
 
-       p = smb_buf(req->inbuf)+1;
+       p = (const char *)req->buf+1;
        p += srvstr_pull_buf_talloc(
                smbd_msg_state, (char *)req->inbuf, req->flags2,
                &smbd_msg_state->from, p, STR_ASCII|STR_TERMINATE) + 1;
@@ -236,7 +236,7 @@ void reply_sendstrt(struct smb_request *req)
 void reply_sendtxt(struct smb_request *req)
 {
        int len;
-       char *msg;
+       const char *msg;
        char *tmp;
        size_t old_len;
 
@@ -254,7 +254,7 @@ void reply_sendtxt(struct smb_request *req)
                return;
        }
 
-       msg = smb_buf(req->inbuf) + 1;
+       msg = (const char *)req->buf + 1;
 
        old_len = talloc_get_size(smbd_msg_state->msg);