diff options
| -rw-r--r-- | librpc/idl/messaging.idl | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/lib/smbd_shim.c | 8 | ||||
| -rw-r--r-- | source3/lib/smbd_shim.h | 3 | ||||
| -rw-r--r-- | source3/locking/locking.c | 5 | ||||
| -rw-r--r-- | source3/smbd/close.c | 5 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 19 | ||||
| -rw-r--r-- | source3/smbd/server.c | 18 | ||||
| -rw-r--r-- | source3/smbd/server_reload.c | 1 | ||||
| -rw-r--r-- | source3/smbd/statcache.c | 448 | ||||
| -rw-r--r-- | source3/wscript_build | 1 |
11 files changed, 1 insertions, 511 deletions
diff --git a/librpc/idl/messaging.idl b/librpc/idl/messaging.idl index 5d217c03f5b..398deed8e4c 100644 --- a/librpc/idl/messaging.idl +++ b/librpc/idl/messaging.idl @@ -79,7 +79,7 @@ interface messaging MSG_SMB_INJECT_FAULT = 0x030C, MSG_SMB_BLOCKING_LOCK_CANCEL = 0x030D, MSG_SMB_NOTIFY = 0x030E, - MSG_SMB_STAT_CACHE_DELETE = 0x030F, + /* MSG_SMB_STAT_CACHE_DELETE = 0x030F, Obsoleted */ /* Samba4 compatibility */ MSG_PVFS_NOTIFY = 0x0310, diff --git a/source3/include/proto.h b/source3/include/proto.h index bbd45c536ff..79d424fd10d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -763,8 +763,6 @@ void unbecome_root(void); int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out); bool lp_allow_local_address( int snum, const struct tsocket_address *local_address); -void send_stat_cache_delete_message(struct messaging_context *msg_ctx, - const char *name); NTSTATUS can_delete_directory_fsp(files_struct *fsp); bool change_to_root_user(void); bool become_authenticated_pipe_user(struct auth_session_info *session_info); diff --git a/source3/lib/smbd_shim.c b/source3/lib/smbd_shim.c index a6e3695096d..c7c64f76cd0 100644 --- a/source3/lib/smbd_shim.c +++ b/source3/lib/smbd_shim.c @@ -32,14 +32,6 @@ void set_smbd_shim(const struct smbd_shim *shim_functions) shim = *shim_functions; } -void send_stat_cache_delete_message(struct messaging_context *msg_ctx, - const char *name) -{ - if (shim.send_stat_cache_delete_message) { - shim.send_stat_cache_delete_message(msg_ctx, name); - } -} - bool change_to_root_user(void) { if (shim.change_to_root_user) { diff --git a/source3/lib/smbd_shim.h b/source3/lib/smbd_shim.h index 19ce7acd50e..c4bf330da4f 100644 --- a/source3/lib/smbd_shim.h +++ b/source3/lib/smbd_shim.h @@ -29,9 +29,6 @@ struct smbd_shim { - void (*send_stat_cache_delete_message)(struct messaging_context *msg_ctx, - const char *name); - bool (*change_to_root_user)(void); bool (*become_authenticated_pipe_user)(struct auth_session_info *session_info); bool (*unbecome_authenticated_pipe_user)(void); diff --git a/source3/locking/locking.c b/source3/locking/locking.c index a65124403cf..5c2613b117c 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -965,11 +965,6 @@ static void set_delete_on_close_locked(struct share_mode_lock *lck, reset_delete_on_close_lck(state->fsp, lck); } - if (state->fsp->fsp_flags.is_directory) { - send_stat_cache_delete_message(state->fsp->conn->sconn->msg_ctx, - state->fsp->fsp_name->base_name); - } - state->fsp->fsp_flags.delete_on_close = state->delete_on_close; } diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 94678b5b8db..d1e89325780 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -343,11 +343,6 @@ static void close_share_mode_lock_prepare(struct share_mode_lock *lck, /* Initial delete on close was set and no one else * wrote a real delete on close. */ - if (fsp->fsp_flags.is_directory) { - send_stat_cache_delete_message(fsp->conn->sconn->msg_ctx, - fsp->fsp_name->base_name); - } - fsp->fsp_flags.delete_on_close = true; set_delete_on_close_lck(fsp, lck, fsp->conn->session_info->security_token, diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index b1ad45667a0..069c069f803 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -1094,25 +1094,6 @@ bool is_share_read_only_for_token(const char *username, NTSTATUS srvstr_push_fn(const char *base_ptr, uint16_t smb_flags2, void *dest, const char *src, int dest_len, int flags, size_t *ret_len); -/* The following definitions come from smbd/statcache.c */ - -void stat_cache_add( const char *full_orig_name, - const char *translated_path, - NTTIME twrp, - bool case_sensitive); -bool stat_cache_lookup(connection_struct *conn, - char **pp_name, - char **pp_dirpath, - char **pp_start, - NTTIME twrp, - SMB_STRUCT_STAT *pst); -void smbd_send_stat_cache_delete_message(struct messaging_context *msg_ctx, - const char *name); -void send_stat_cache_delete_message(struct messaging_context *msg_ctx, - const char *name); -void stat_cache_delete(const char *name); -bool reset_stat_cache( void ); - /* The following definitions come from smbd/statvfs.c */ int sys_statvfs(const char *path, struct vfs_statvfs_struct *statbuf); diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 155d2207609..6bdaca7a0a4 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -124,21 +124,6 @@ static void smbd_parent_conf_updated(struct messaging_context *msg, messaging_send_to_children(msg, MSG_SMB_CONF_UPDATED, NULL); } -/******************************************************************* - Delete a statcache entry. - ********************************************************************/ - -static void smb_stat_cache_delete(struct messaging_context *msg, - void *private_data, - uint32_t msg_tnype, - struct server_id server_id, - DATA_BLOB *data) -{ - const char *name = (const char *)data->data; - DEBUG(10,("smb_stat_cache_delete: delete name %s\n", name)); - stat_cache_delete(name); -} - /**************************************************************************** Send a SIGTERM to our process group. *****************************************************************************/ @@ -1280,8 +1265,6 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, messaging_register(msg_ctx, NULL, MSG_SHUTDOWN, msg_exit_server); messaging_register(msg_ctx, ev_ctx, MSG_SMB_CONF_UPDATED, smbd_parent_conf_updated); - messaging_register(msg_ctx, NULL, MSG_SMB_STAT_CACHE_DELETE, - smb_stat_cache_delete); messaging_register(msg_ctx, NULL, MSG_DEBUG, smbd_msg_debug); messaging_register(msg_ctx, NULL, MSG_SMB_FORCE_TDIS, smb_parent_send_to_children); @@ -1620,7 +1603,6 @@ extern void build_options(bool screen); loadparm_s3_global_substitution(); static const struct smbd_shim smbd_shim_fns = { - .send_stat_cache_delete_message = smbd_send_stat_cache_delete_message, .change_to_root_user = smbd_change_to_root_user, .become_authenticated_pipe_user = smbd_become_authenticated_pipe_user, .unbecome_authenticated_pipe_user = smbd_unbecome_authenticated_pipe_user, diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index 329edf640da..d3322d12f6a 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -170,7 +170,6 @@ bool reload_services(struct smbd_server_connection *sconn, } mangle_reset_cache(); - reset_stat_cache(); flush_dfree_cache(); return(ret); diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c deleted file mode 100644 index 4138a9287ad..00000000000 --- a/source3/smbd/statcache.c +++ /dev/null @@ -1,448 +0,0 @@ -/* - Unix SMB/CIFS implementation. - stat cache code - Copyright (C) Andrew Tridgell 1992-2000 - Copyright (C) Jeremy Allison 1999-2007 - Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003 - Copyright (C) Volker Lendecke 2007 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "includes.h" -#include "../lib/util/memcache.h" -#include "smbd/smbd.h" -#include "messages.h" -#include "serverid.h" -#include "smbprofile.h" -#include <tdb.h> - -#define STAT_CACHE_TWRP_TOKEN "%016" PRIx64 "@%s" -#define STAT_CACHE_TWRP_TOKEN_LEN 17 - -/**************************************************************************** - Stat cache code used in unix_convert. -*****************************************************************************/ - -/** - * Add an entry into the stat cache. - * - * @param full_orig_name The original name as specified by the client - * @param orig_translated_path The name on our filesystem. - * - * @note Only the first strlen(orig_translated_path) characters are stored - * into the cache. This means that full_orig_name will be internally - * truncated. - * - */ - -void stat_cache_add( const char *full_orig_name, - const char *translated_path_in, - NTTIME twrp, - bool case_sensitive) -{ - size_t translated_path_length; - char *translated_path = NULL; - char *original_path; - size_t original_path_length; - TALLOC_CTX *ctx = talloc_tos(); - - if (!lp_stat_cache()) { - return; - } - - /* - * Don't cache trivial valid directory entries such as . and .. - */ - - if ((*full_orig_name == '\0') - || ISDOT(full_orig_name) || ISDOTDOT(full_orig_name)) { - return; - } - - translated_path = talloc_asprintf(ctx, - STAT_CACHE_TWRP_TOKEN, - twrp, - translated_path_in); - if (translated_path == NULL) { - return; - } - - /* - * If we are in case insentive mode, we don't need to - * store names that need no translation - else, it - * would be a waste. - */ - - if (!case_sensitive && (strcmp(full_orig_name, translated_path) == 0)) { - TALLOC_FREE(translated_path); - return; - } - - /* - * Remove any trailing '/' characters from the - * translated path. - */ - - translated_path_length = strlen(translated_path); - - if(translated_path[translated_path_length-1] == '/') { - translated_path_length--; - } - - if(case_sensitive) { - original_path = talloc_asprintf(ctx, - STAT_CACHE_TWRP_TOKEN, - twrp, - full_orig_name); - } else { - char *upper = NULL; - - upper = talloc_strdup_upper(ctx, full_orig_name); - if (upper == NULL) { - TALLOC_FREE(translated_path); - return; - } - original_path = talloc_asprintf(ctx, - STAT_CACHE_TWRP_TOKEN, - twrp, - upper); - TALLOC_FREE(upper); - } - - if (!original_path) { - TALLOC_FREE(translated_path); - return; - } - - original_path_length = strlen(original_path); - - if(original_path[original_path_length-1] == '/') { - original_path[original_path_length-1] = '\0'; - original_path_length--; - } - - if (original_path_length != translated_path_length) { - if (original_path_length < translated_path_length) { - DEBUG(0, ("OOPS - tried to store stat cache entry " - "for weird length paths [%s] %lu and [%s] %lu)!\n", - original_path, - (unsigned long)original_path_length, - translated_path, - (unsigned long)translated_path_length)); - TALLOC_FREE(original_path); - TALLOC_FREE(translated_path); - return; - } - - /* we only want to index by the first part of original_path, - up to the length of translated_path */ - - original_path[translated_path_length] = '\0'; - original_path_length = translated_path_length; - } - - /* Ensure we're null terminated. */ - translated_path[translated_path_length] = '\0'; - - /* - * New entry or replace old entry. - */ - - memcache_add( - smbd_memcache(), STAT_CACHE, - data_blob_const(original_path, original_path_length), - data_blob_const(translated_path, translated_path_length + 1)); - - DEBUG(5,("stat_cache_add: Added entry (%lx:size %x) %s -> %s\n", - (unsigned long)translated_path, - (unsigned int)translated_path_length, - original_path, - translated_path)); - - TALLOC_FREE(original_path); - TALLOC_FREE(translated_path); -} - -/** - * Look through the stat cache for an entry - * - * @param conn A connection struct to do the stat() with. - * @param posix_paths Whether to lookup using stat() or lstat() - * @param name The path we are attempting to cache, modified by this routine - * to be correct as far as the cache can tell us. We assume that - * it is a talloc'ed string from top of stack, we free it if - * necessary. - * @param dirpath The path as far as the stat cache told us. Also talloced - * from top of stack. - * @param start A pointer into name, for where to 'start' in fixing the rest - * of the name up. - * @param psd A stat buffer, NOT from the cache, but just a side-effect. - * - * @return True if we translated (and did a successful stat on) the entire - * name. - * - */ - -bool stat_cache_lookup(connection_struct *conn, - char **pp_name, - char **pp_dirpath, - char **pp_start, - NTTIME twrp, - SMB_STRUCT_STAT *pst) -{ - char *chk_name; - size_t namelen; - bool sizechanged = False; - unsigned int num_components = 0; - char *translated_path; - size_t translated_path_length; - DATA_BLOB data_val; - char *name; - TALLOC_CTX *ctx = talloc_tos(); - struct smb_filename smb_fname; - int ret; - - *pp_dirpath = NULL; - *pp_start = *pp_name; - - if (!lp_stat_cache()) { - return False; - } - - name = *pp_name; - namelen = strlen(name); - - DO_PROFILE_INC(statcache_lookups); - - /* - * Don't lookup trivial valid directory entries. - */ - if ((*name == '\0') || ISDOT(name) || ISDOTDOT(name)) { - return False; - } - - if (conn->case_sensitive) { - chk_name = talloc_asprintf(ctx, - STAT_CACHE_TWRP_TOKEN, - twrp, - name); - if (!chk_name) { - DEBUG(0, ("stat_cache_lookup: strdup failed!\n")); - return False; - } - - } else { - char *upper = NULL; - - upper = talloc_strdup_upper(ctx,name); - if (upper == NULL) { - DBG_ERR("talloc_strdup_upper failed!\n"); - return False; - } - chk_name = talloc_asprintf(ctx, - STAT_CACHE_TWRP_TOKEN, - twrp, - upper); - if (!chk_name) { - DEBUG(0, ("stat_cache_lookup: talloc_strdup_upper failed!\n")); - return False; - } - - /* - * In some language encodings the length changes - * if we uppercase. We need to treat this differently - * below. - */ - if (strlen(chk_name) != namelen) { - sizechanged = True; - } - } - - while (1) { - char *sp; - - data_val = data_blob_null; - - if (memcache_lookup( - smbd_memcache(), STAT_CACHE, - data_blob_const(chk_name, strlen(chk_name)), - &data_val)) { - break; - } - - DEBUG(10,("stat_cache_lookup: lookup failed for name [%s]\n", - chk_name )); - /* - * Didn't find it - remove last component for next try. - */ - if (!(sp = strrchr_m(chk_name, '/'))) { - /* - * We reached the end of the name - no match. - */ - DO_PROFILE_INC(statcache_misses); - TALLOC_FREE(chk_name); - return False; - } - - *sp = '\0'; - - /* - * Count the number of times we have done this, we'll - * need it when reconstructing the string. - */ - num_components++; - - if ((*chk_name == '\0') - || ISDOT(chk_name) || ISDOTDOT(chk_name)) { - DO_PROFILE_INC(statcache_misses); - TALLOC_FREE(chk_name); - return False; - } - } - - SMB_ASSERT(data_val.length >= STAT_CACHE_TWRP_TOKEN_LEN); - - translated_path = talloc_strdup( - ctx,(char *)data_val.data + STAT_CACHE_TWRP_TOKEN_LEN); - if (!translated_path) { - smb_panic("talloc failed"); - } - translated_path_length = data_val.length - 1 - STAT_CACHE_TWRP_TOKEN_LEN; - - DEBUG(10,("stat_cache_lookup: lookup succeeded for name [%s] " - "-> [%s]\n", chk_name, translated_path )); - DO_PROFILE_INC(statcache_hits); - - smb_fname = (struct smb_filename) { - .base_name = translated_path, - .twrp = twrp, - }; - - ret = vfs_stat(conn, &smb_fname); - if (ret != 0) { - /* Discard this entry - it doesn't exist in the filesystem. */ - memcache_delete(smbd_memcache(), STAT_CACHE, - data_blob_const(chk_name, strlen(chk_name))); - TALLOC_FREE(chk_name); - TALLOC_FREE(translated_path); - return False; - } - /* - * Only copy the stat struct back if we actually hit the full path - */ - if (num_components == 0) { - *pst = smb_fname.st; - } - - if (!sizechanged) { - memcpy(*pp_name, translated_path, - MIN(namelen, translated_path_length)); - } else { - if (num_components == 0) { - name = talloc_strndup(ctx, translated_path, - translated_path_length); - } else { - char *sp; - - sp = strnrchr_m(name, '/', num_components); - if (sp) { - name = talloc_asprintf(ctx,"%.*s%s", - (int)translated_path_length, - translated_path, sp); - } else { - name = talloc_strndup(ctx, - translated_path, - translated_path_length); - } - } - if (name == NULL) { - /* - * TODO: Get us out of here with a real error message - */ - smb_panic("talloc failed"); - } - TALLOC_FREE(*pp_name); - *pp_name = name; - } - - - /* set pointer for 'where to start' on fixing the rest of the name */ - *pp_start = &name[translated_path_length]; - if (**pp_start == '/') { - ++*pp_start; - } - - *pp_dirpath = translated_path; - TALLOC_FREE(chk_name); - return (namelen == translated_path_length); -} - -/*************************************************************************** - Tell all smbd's to delete an entry. -**************************************************************************/ - -void smbd_send_stat_cache_delete_message(struct messaging_context *msg_ctx, - const char *name) -{ -#ifdef DEVELOPER - messaging_send_all(msg_ctx, - MSG_SMB_STAT_CACHE_DELETE, - name, - strlen(name)+1); -#endif -} - -/*************************************************************************** - Delete an entry. -**************************************************************************/ - -void stat_cache_delete(const char *name) -{ - char *upper = talloc_strdup_upper(talloc_tos(), name); - char *lname = NULL; - - if (upper == NULL) { - return; - } - - lname = talloc_asprintf(talloc_tos(), - STAT_CACHE_TWRP_TOKEN, - (uint64_t)0, - upper); - TALLOC_FREE(upper); - if (lname == NULL) { - return; - } - DEBUG(10,("stat_cache_delete: deleting name [%s] -> %s\n", - lname, name )); - - memcache_delete(smbd_memcache(), STAT_CACHE, - data_blob_const(lname, talloc_get_size(lname)-1)); - TALLOC_FREE(lname); -} - -/*************************************************************************** - Initializes or clears the stat cache. -**************************************************************************/ - -bool reset_stat_cache( void ) -{ - if (!lp_stat_cache()) - return True; - - memcache_flush(smbd_memcache(), STAT_CACHE); - - return True; -} diff --git a/source3/wscript_build b/source3/wscript_build index df0bfb95c01..e59ea573840 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -646,7 +646,6 @@ bld.SAMBA3_LIBRARY('smbd_base', smbd/srvstr.c smbd/vfs.c smbd/perfcount.c - smbd/statcache.c smbd/seal.c smbd/posix_acls.c lib/sysacls.c |