From: Jeremy Allison Date: Mon, 28 Feb 2022 22:30:27 +0000 (-0800) Subject: s3: smbd: Remove now unused OpenDir(). X-Git-Tag: tevent-0.12.0~586 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0bbf6f41195dd2af08f303ce3feef3becd79af1;p=thirdparty%2Fsamba.git s3: smbd: Remove now unused OpenDir(). Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke --- diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index c9cc6b73e58..1fca65cc30d 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1511,25 +1511,6 @@ NTSTATUS OpenDir_ntstatus(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx, - connection_struct *conn, - const struct smb_filename *smb_dname, - const char *mask, - uint32_t attr) -{ - struct smb_Dir *dir_hnd = NULL; - NTSTATUS status; - - status = OpenDir_ntstatus( - mem_ctx, conn, smb_dname, mask, attr, &dir_hnd); - if (!NT_STATUS_IS_OK(status)) { - /* Ensure we return the actual error from status in errno. */ - errno = map_errno_from_nt_status(status); - return NULL; - } - - return dir_hnd; -} /******************************************************************* Open a directory from an fsp. ********************************************************************/ diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 6ca5e125aaf..2c97a7f822f 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -237,11 +237,6 @@ NTSTATUS OpenDir_ntstatus(TALLOC_CTX *mem_ctx, const char *mask, uint32_t attr, struct smb_Dir **_dir_hnd); -struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx, - connection_struct *conn, - const struct smb_filename *smb_fname, - const char *mask, - uint32_t attr); const char *ReadDirName(struct smb_Dir *dir_hnd, long *poffset, SMB_STRUCT_STAT *sbuf, char **talloced); void RewindDir(struct smb_Dir *dir_hnd, long *poffset);