diff options
| author | Volker Lendecke <vl@samba.org> | 2012-08-31 14:52:21 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-09-04 15:15:00 -0700 |
| commit | 93e10db3dde3616ab61bf28e0b9c44378d445ab5 (patch) | |
| tree | 847e091745452cf12fc214349122e06be8d449ad | |
| parent | 1c9b1e07662dca308c8432890d3d5055639b675a (diff) | |
| download | samba-93e10db3dde3616ab61bf28e0b9c44378d445ab5.tar.gz samba-93e10db3dde3616ab61bf28e0b9c44378d445ab5.tar.bz2 samba-93e10db3dde3616ab61bf28e0b9c44378d445ab5.zip | |
s3: Make "open_match_attributes" static
Signed-off-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/smbd/open.c | 12 | ||||
| -rw-r--r-- | 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 381f3b5b27..5714157970 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 5f4947e934..b7bab6ebfc 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); |