Pass smb_request to send_trans_reply to match with send_[nt]trans[2]_reply

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 441ab2cf299ec00dd1a8181d53a998eb0de71a2f..5ca5c7766fdf3a12bacac3773c22d39df2e2af66 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7869,7 +7869,7 @@ NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *fsp,
 /* The following definitions come from smbd/ipc.c  */
 
 void send_trans_reply(connection_struct *conn,
-                     const uint8_t *inbuf,
+                     struct smb_request *req,
                      char *rparam, int rparam_len,
                      char *rdata, int rdata_len,
                      bool buffer_too_large);

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 3d70e7ab968a769a33a8cfda893f90409a9cd853..b9460e5211f1b73ba615b88e05d9778b60213689 100644 (file)
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -81,7 +81,8 @@ static void copy_trans_params_and_data(char *outbuf, int align,
  Send a trans reply.
  ****************************************************************************/
 
-void send_trans_reply(connection_struct *conn, const uint8_t *inbuf,
+void send_trans_reply(connection_struct *conn,
+                     struct smb_request *req,
                      char *rparam, int rparam_len,
                      char *rdata, int rdata_len,
                      bool buffer_too_large)
@@ -103,7 +104,7 @@ void send_trans_reply(connection_struct *conn, const uint8_t *inbuf,
 
        align = ((this_lparam)%4);
 
-       if (!create_outbuf(talloc_tos(), (char *)inbuf, &outbuf,
+       if (!create_outbuf(talloc_tos(), (char *)req->inbuf, &outbuf,
                           10, 1+align+this_ldata+this_lparam)) {
                smb_panic("could not allocate outbuf");
        }
@@ -154,7 +155,7 @@ void send_trans_reply(connection_struct *conn, const uint8_t *inbuf,
 
                align = (this_lparam%4);
 
-               if (!create_outbuf(talloc_tos(), (char *)inbuf, &outbuf,
+               if (!create_outbuf(talloc_tos(), (char *)req->inbuf, &outbuf,
                                   10, 1+align+this_ldata+this_lparam)) {
                        smb_panic("could not allocate outbuf");
                }
@@ -218,7 +219,7 @@ static void api_rpc_trans_reply(connection_struct *conn,
                return;
        }
 
-       send_trans_reply(conn, req->inbuf, NULL, 0, (char *)rdata, data_len,
+       send_trans_reply(conn, req, NULL, 0, (char *)rdata, data_len,
                         is_data_outstanding);
        SAFE_FREE(rdata);
        return;
@@ -239,7 +240,7 @@ static void api_WNPHS(connection_struct *conn, struct smb_request *req,
        DEBUG(4,("WaitNamedPipeHandleState priority %x\n",
                 (int)SVAL(param,0)));
 
-       send_trans_reply(conn, req->inbuf, NULL, 0, NULL, 0, False);
+       send_trans_reply(conn, req, NULL, 0, NULL, 0, False);
 }
 
 
@@ -257,7 +258,7 @@ static void api_SNPHS(connection_struct *conn, struct smb_request *req,
 
        DEBUG(4,("SetNamedPipeHandleState to code %x\n", (int)SVAL(param,0)));
 
-       send_trans_reply(conn, req->inbuf, NULL, 0, NULL, 0, False);
+       send_trans_reply(conn, req, NULL, 0, NULL, 0, False);
 }
 
 
@@ -276,7 +277,7 @@ static void api_no_reply(connection_struct *conn, struct smb_request *req)
        DEBUG(3,("Unsupported API fd command\n"));
 
        /* now send the reply */
-       send_trans_reply(conn, req->inbuf, rparam, 4, NULL, 0, False);
+       send_trans_reply(conn, req, rparam, 4, NULL, 0, False);
 
        return;
 }
@@ -320,8 +321,7 @@ static void api_fd_reply(connection_struct *conn, uint16 vuid,
                        /* Win9x does this call with a unicode pipe name, not a pnum. */
                        /* Just return success for now... */
                        DEBUG(3,("Got TRANSACT_WAITNAMEDPIPEHANDLESTATE on text pipe name\n"));
-                       send_trans_reply(conn, req->inbuf, NULL, 0, NULL, 0,
-                                        False);
+                       send_trans_reply(conn, req, NULL, 0, NULL, 0, False);
                        return;
                }
 

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 0c866da7069b5fd7de1fc1bb2036f2db8f256689..6ed3ce2c87e00218cfa30b269bd8a84350193d9e 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -4632,7 +4632,7 @@ void api_reply(connection_struct *conn, uint16 vuid,
 
        /* If api_Unsupported returns false we can't return anything. */
        if (reply) {
-               send_trans_reply(conn, req->inbuf, rparam, rparam_len,
+               send_trans_reply(conn, req, rparam, rparam_len,
                                 rdata, rdata_len, False);
        }