From: Volker Lendecke <vl@samba.org>
Date: Thu, 19 Jun 2008 14:31:59 +0000 (+0200)
Subject: Remove the "current_user" arg from fsp_belongs_conn
X-Git-Tag: samba-3.3.0pre1~837
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64e9372ab997739d46669c0cc4a4c6edb11d5e64;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source/include/proto.h b/source/include/proto.h
index 0ca8693e576..e60bfb76a1e 100644
--- a/source/include/proto.h
+++ b/source/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/source/smbd/nttrans.c b/source/smbd/nttrans.c
index 61562b2de24..8e55d6b8e98 100644
--- a/source/smbd/nttrans.c
+++ b/source/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/source/smbd/reply.c b/source/smbd/reply.c
index 4427ba2ebd9..f36c5c4d312 100644
--- a/source/smbd/reply.c
+++ b/source/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;
 	}