Remove the "current_user" arg from fsp_belongs_conn

fsp_belongs_conn only used the vuid struct member anyway, and this is available
in the smb_request structure as well.
(This used to be commit 64e9372ab997739d46669c0cc4a4c6edb11d5e64)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0ca8693e576dce5b79e5221b5e8da6356e120ada..e60bfb76a1eada28e55b649effb45c2fcbe70876 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -10093,7 +10093,7 @@ bool check_fsp_open(connection_struct *conn, struct smb_request *req,
 bool check_fsp(connection_struct *conn, struct smb_request *req,
               files_struct *fsp);
 bool fsp_belongs_conn(connection_struct *conn, struct smb_request *req,
-                     files_struct *fsp, struct current_user *user);
+                     files_struct *fsp);
 void reply_special(char *inbuf);
 void reply_tcon(struct smb_request *req);
 void reply_tcon_and_X(struct smb_request *req);

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 61562b2de24089d485e64751908f5b8f52a25ae5..8e55d6b8e9834ec1c98ebe542d3b6ac78c93fe7a 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1773,7 +1773,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
 
                DEBUG(10,("FSCTL_CREATE_OR_GET_OBJECT_ID: called on FID[0x%04X]\n",fidnum));
 
-               if (!fsp_belongs_conn(conn, req, fsp, &current_user)) {
+               if (!fsp_belongs_conn(conn, req, fsp)) {
                        return;
                }
 
@@ -1828,7 +1828,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                uint32 i;
                char *cur_pdata;
 
-               if (!fsp_belongs_conn(conn, req, fsp, &current_user)) {
+               if (!fsp_belongs_conn(conn, req, fsp)) {
                        return;
                }
 
@@ -1951,7 +1951,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
 
                DEBUG(10,("FSCTL_FIND_FILES_BY_SID: called on FID[0x%04X]\n",fidnum));
 
-               if (!fsp_belongs_conn(conn, req, fsp, &current_user)) {
+               if (!fsp_belongs_conn(conn, req, fsp)) {
                        return;
                }
 

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 4427ba2ebd965d87c1ab2315b5c5c3a98c63d3bc..f36c5c4d312b697d84938d1b5aa0ad95416da0b5 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -368,10 +368,10 @@ bool check_fsp(connection_struct *conn, struct smb_request *req,
 ****************************************************************************/
 
 bool fsp_belongs_conn(connection_struct *conn, struct smb_request *req,
-                     files_struct *fsp, struct current_user *user)
+                     files_struct *fsp)
 {
        if ((fsp) && (conn) && ((conn)==(fsp)->conn)
-           && (current_user.vuid==(fsp)->vuid)) {
+           && (req->vuid == (fsp)->vuid)) {
                return True;
        }