From 043c232144830d4da12cae877994caa16ec91c6d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 17 Jul 2019 14:58:25 -0700 Subject: [PATCH] s3: smbd: Remove dptr_close(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/dir.c | 38 -------------------------------------- source3/smbd/proto.h | 1 - 2 files changed, 39 deletions(-) diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 1ca167bb1ec..bc80b4d8f1c 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -207,44 +207,6 @@ done: TALLOC_FREE(dptr); } -/**************************************************************************** - Close a dptr given a key. SMB1 *only*. -****************************************************************************/ - -void dptr_close(struct smbd_server_connection *sconn, int *key) -{ - struct dptr_struct *dptr; - files_struct *fsp = NULL; - struct smb_Dir *dir_hnd = NULL; - - SMB_ASSERT(!sconn->using_smb2); - - if(*key == INVALID_DPTR_KEY) - return; - - dptr = dptr_get(sconn, *key); - - if (!dptr) { - DEBUG(0,("Invalid key %d given to dptr_close\n", *key)); - return; - } - - dir_hnd = dptr->dir_hnd; - - if (dir_hnd != NULL && dir_hnd->fsp != NULL) { - SMB_ASSERT(dir_hnd->fsp->dptr->dir_hnd == dir_hnd); - fsp = dir_hnd->fsp; - } - - dptr_close_internal(dptr); - - if (fsp != NULL) { - fsp->dptr = NULL; - } - - *key = INVALID_DPTR_KEY; -} - /**************************************************************************** Close all dptrs for a cnum. ****************************************************************************/ diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index a07614f9969..b8e1468680c 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -183,7 +183,6 @@ bool init_dptrs(struct smbd_server_connection *sconn); const char *dptr_path(struct smbd_server_connection *sconn, int key); const char *dptr_wcard(struct smbd_server_connection *sconn, int key); uint16_t dptr_attr(struct smbd_server_connection *sconn, int key); -void dptr_close(struct smbd_server_connection *sconn, int *key); void dptr_closecnum(connection_struct *conn); NTSTATUS dptr_create(connection_struct *conn, struct smb_request *req, -- 2.47.3