s3: smbd: Plumb through struct smb_request *req parameter so it can be used by smb_qu...

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index fef1c3810eef4a5118b9e583b85b7017084c0d52..f0c1624babe6beff97e9219c7df53691c8d6b042 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -123,6 +123,7 @@ NTSTATUS smbd_do_unlocking(struct smb_request *req,
 
 NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                               TALLOC_CTX *mem_ctx,
+                              struct smb_request *req,
                               uint16_t info_level,
                               files_struct *fsp,
                               struct smb_filename *smb_fname,

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 006f313c63fad83f375633832e6e5c2a87875dc5..01aedbf8e2e2e0961f0da4160e8cf731f9d68f97 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -392,6 +392,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                }
 
                status = smbd_do_qfilepathinfo(conn, state,
+                                              smbreq,
                                               file_info_level,
                                               fsp,
                                               fsp->fsp_name,

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4e3d279a70ec02600236b6fe6fe978e332f21747..b704f887bdc66131c50d8fc6e83c7c19f085ea73 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4849,6 +4849,7 @@ static NTSTATUS marshall_stream_info(unsigned int num_streams,
 
 #if defined(HAVE_POSIX_ACLS)
 static NTSTATUS smb_query_posix_acl(connection_struct *conn,
+                               struct smb_request *req,
                                files_struct *fsp,
                                struct smb_filename *smb_fname,
                                char *pdata,
@@ -5051,6 +5052,7 @@ static void call_trans2qpipeinfo(connection_struct *conn,
 
 NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                               TALLOC_CTX *mem_ctx,
+                              struct smb_request *req,
                               uint16_t info_level,
                               files_struct *fsp,
                               struct smb_filename *smb_fname,
@@ -5775,6 +5777,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                case SMB_QUERY_POSIX_ACL:
                        {
                                status = smb_query_posix_acl(conn,
+                                                       req,
                                                        fsp,
                                                        smb_fname,
                                                        pdata,
@@ -6271,7 +6274,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                return;
        }
 
-       status = smbd_do_qfilepathinfo(conn, req, info_level,
+       status = smbd_do_qfilepathinfo(conn, req, req, info_level,
                                       fsp, smb_fname,
                                       delete_pending, write_time_ts,
                                       ea_list,