From 24e7f40687b9542543533e1a4820b8f3f0016f07 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 18 Jun 2008 00:02:28 +0200 Subject: smbd/dir.c: remove unneeded stat buf parameter from user_can_read_file() This is not needed anymore since user_can_access_file_acl() ist used. Michael (This used to be commit 3c349f773a52e3de693d3bb79f5060c9f1e01e41) --- source3/smbd/dir.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 2d9e7e7527..74cd63ddda 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -921,7 +921,7 @@ bool get_dir_entry(TALLOC_CTX *ctx, use it for anything security sensitive. ********************************************************************/ -static bool user_can_read_file(connection_struct *conn, char *name, SMB_STRUCT_STAT *pst) +static bool user_can_read_file(connection_struct *conn, char *name) { /* * If user is a member of the Admin group @@ -932,8 +932,6 @@ static bool user_can_read_file(connection_struct *conn, char *name, SMB_STRUCT_S return True; } - SMB_ASSERT(VALID_STAT(*pst)); - return can_access_file_acl(conn, name, FILE_READ_DATA); } @@ -1037,7 +1035,7 @@ bool is_visible_file(connection_struct *conn, const char *dir_path, const char * } /* Honour _hide unreadable_ option */ - if (hide_unreadable && !user_can_read_file(conn, entry, pst)) { + if (hide_unreadable && !user_can_read_file(conn, entry)) { DEBUG(10,("is_visible_file: file %s is unreadable.\n", entry )); SAFE_FREE(entry); return False; -- cgit