diff options
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 8 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 16 |
3 files changed, 4 insertions, 22 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 2b2754c16f..df991e35f4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6139,8 +6139,6 @@ bool check_fsp(connection_struct *conn, struct smb_request *req, files_struct *fsp); bool check_fsp_ntquota_handle(connection_struct *conn, struct smb_request *req, files_struct *fsp); -bool fsp_belongs_conn(connection_struct *conn, struct smb_request *req, - files_struct *fsp); void reply_special(struct smbd_server_connection *sconn, 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 c5b5fee6d1..839d1b35a5 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -2051,7 +2051,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)) { + if (!check_fsp_open(conn, req, fsp)) { return; } @@ -2108,7 +2108,7 @@ static void call_nt_transact_ioctl(connection_struct *conn, uint32 i; char *cur_pdata; - if (!fsp_belongs_conn(conn, req, fsp)) { + if (!check_fsp_open(conn, req, fsp)) { return; } @@ -2231,7 +2231,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)) { + if (!check_fsp_open(conn, req, fsp)) { return; } @@ -2281,7 +2281,7 @@ static void call_nt_transact_ioctl(connection_struct *conn, NTSTATUS status; uint64_t offset, length; - if (!fsp_belongs_conn(conn, req, fsp)) { + if (!check_fsp_open(conn, req, fsp)) { return; } diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 4d33652a87..19c9870ac0 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -386,22 +386,6 @@ bool check_fsp_ntquota_handle(connection_struct *conn, struct smb_request *req, return true; } -/**************************************************************************** - Check if we have a correct fsp. Replacement for the FSP_BELONGS_CONN macro -****************************************************************************/ - -bool fsp_belongs_conn(connection_struct *conn, struct smb_request *req, - files_struct *fsp) -{ - if ((fsp) && (conn) && ((conn)==(fsp)->conn) - && (req->vuid == (fsp)->vuid)) { - return True; - } - - reply_nterror(req, NT_STATUS_INVALID_HANDLE); - return False; -} - static bool netbios_session_retarget(const char *name, int name_type) { char *trim_name; |