From 93e10db3dde3616ab61bf28e0b9c44378d445ab5 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 31 Aug 2012 14:52:21 +0200 Subject: [PATCH] s3: Make "open_match_attributes" static Signed-off-by: Jeremy Allison --- source3/smbd/open.c | 12 ++++++------ source3/smbd/proto.h | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 381f3b5b27f..5714157970b 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1480,12 +1480,12 @@ static void defer_open(struct share_mode_lock *lck, On overwrite open ensure that the attributes match. ****************************************************************************/ -bool open_match_attributes(connection_struct *conn, - uint32 old_dos_attr, - uint32 new_dos_attr, - mode_t existing_unx_mode, - mode_t new_unx_mode, - mode_t *returned_unx_mode) +static bool open_match_attributes(connection_struct *conn, + uint32 old_dos_attr, + uint32 new_dos_attr, + mode_t existing_unx_mode, + mode_t new_unx_mode, + mode_t *returned_unx_mode) { uint32 noarch_old_dos_attr, noarch_new_dos_attr; diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 5f4947e9349..b7bab6ebfc4 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -608,12 +608,6 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf); bool is_stat_open(uint32 access_mask); -bool open_match_attributes(connection_struct *conn, - uint32 old_dos_attr, - uint32 new_dos_attr, - mode_t existing_unx_mode, - mode_t new_unx_mode, - mode_t *returned_unx_mode); void remove_deferred_open_entry(struct file_id id, uint64_t mid, struct server_id pid); bool is_deferred_open_async(const void *ptr); -- 2.11.4.GIT