*/
#include "includes.h"
+#include "smbd/globals.h"
/*
This module implements directory related functions for Samba.
bool did_stat; /* Optimisation for non-wcard searches. */
};
-static struct bitmap *dptr_bmap;
-static struct dptr_struct *dirptrs;
-static int dirhandles_open = 0;
#define INVALID_DPTR_KEY (-3)
void init_dptrs(void)
{
- static bool dptrs_init=False;
-
- if (dptrs_init)
+ if (dptr_bmap)
return;
dptr_bmap = bitmap_allocate(MAX_DIRECTORY_HANDLES);
if (!dptr_bmap)
exit_server("out of memory in init_dptrs");
-
- dptrs_init = True;
}
/****************************************************************************
Return the next visible file name, skipping veto'd and invisible files.
****************************************************************************/
-static const char *dptr_normal_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT_STAT *pst)
+static const char *dptr_normal_ReadDirName(struct dptr_struct *dptr,
+ long *poffset, SMB_STRUCT_STAT *pst)
{
/* Normal search for the next file. */
const char *name;
- while ((name = ReadDirName(dptr->dir_hnd, poffset)) != NULL) {
+ while ((name = ReadDirName(dptr->dir_hnd, poffset, pst)) != NULL) {
if (is_visible_file(dptr->conn, dptr->path, name, pst, True)) {
return name;
}
Return the next visible file name, skipping veto'd and invisible files.
****************************************************************************/
-const char *dptr_ReadDirName(TALLOC_CTX *ctx,
+char *dptr_ReadDirName(TALLOC_CTX *ctx,
struct dptr_struct *dptr,
long *poffset,
SMB_STRUCT_STAT *pst)
{
+ struct smb_filename *smb_fname_base = NULL;
+ char *name = NULL;
+ char *pathreal = NULL;
+ char *found_name = NULL;
+ int ret;
+ const char *name_temp = NULL;
+ NTSTATUS status;
+
SET_STAT_INVALID(*pst);
- if (dptr->has_wild) {
- return dptr_normal_ReadDirName(dptr, poffset, pst);
+ if (dptr->has_wild || dptr->did_stat) {
+ name_temp = dptr_normal_ReadDirName(dptr, poffset, pst);
+ name = talloc_strdup(ctx, name_temp);
+ return name;
}
- /* If poffset is -1 then we know we returned this name before and we have
- no wildcards. We're at the end of the directory. */
+ /* If poffset is -1 then we know we returned this name before and we
+ * have no wildcards. We're at the end of the directory. */
if (*poffset == END_OF_DIRECTORY_OFFSET) {
return NULL;
}
- if (!dptr->did_stat) {
- char *pathreal = NULL;
+ /* We know the stored wcard contains no wildcard characters.
+ * See if we can match with a stat call. If we can't, then set
+ * did_stat to true to ensure we only do this once and keep
+ * searching. */
+
+ dptr->did_stat = true;
+
+ /* First check if it should be visible. */
+ if (!is_visible_file(dptr->conn, dptr->path, dptr->wcard,
+ pst, true))
+ {
+ /* This only returns false if the file was found, but
+ is explicitly not visible. Set us to end of
+ directory, but return NULL as we know we can't ever
+ find it. */
+ goto ret;
+ }
- /* We know the stored wcard contains no wildcard characters. See if we can match
- with a stat call. If we can't, then set did_stat to true to
- ensure we only do this once and keep searching. */
+ if (VALID_STAT(*pst)) {
+ name = talloc_strdup(ctx, dptr->wcard);
+ goto ret;
+ }
- dptr->did_stat = True;
+ pathreal = talloc_asprintf(ctx,
+ "%s/%s",
+ dptr->path,
+ dptr->wcard);
+ if (!pathreal)
+ return NULL;
- /* First check if it should be visible. */
- if (!is_visible_file(dptr->conn, dptr->path, dptr->wcard, pst, True)) {
- /* This only returns False if the file was found, but
- is explicitly not visible. Set us to end of directory,
- but return NULL as we know we can't ever find it. */
- dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
- return NULL;
- }
+ /* Create an smb_filename with stream_name == NULL. */
+ status = create_synthetic_smb_fname(ctx, pathreal, NULL, NULL,
+ &smb_fname_base);
+ if (!NT_STATUS_IS_OK(status)) {
+ return NULL;
+ }
- if (VALID_STAT(*pst)) {
- /* We need to set the underlying dir_hnd offset to -1 also as
- this function is usually called with the output from TellDir. */
- dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
- return dptr->wcard;
+ if (SMB_VFS_STAT(dptr->conn, smb_fname_base) == 0) {
+ *pst = smb_fname_base->st;
+ TALLOC_FREE(smb_fname_base);
+ name = talloc_strdup(ctx, dptr->wcard);
+ goto clean;
+ } else {
+ TALLOC_FREE(smb_fname_base);
+ /* If we get any other error than ENOENT or ENOTDIR
+ then the file exists we just can't stat it. */
+ if (errno != ENOENT && errno != ENOTDIR) {
+ name = talloc_strdup(ctx, dptr->wcard);
+ goto clean;
}
+ }
- pathreal = talloc_asprintf(ctx,
- "%s/%s",
- dptr->path,
- dptr->wcard);
- if (!pathreal) {
- return NULL;
- }
+ /* Stat failed. We know this is authoratiative if we are
+ * providing case sensitive semantics or the underlying
+ * filesystem is case sensitive.
+ */
+ if (dptr->conn->case_sensitive ||
+ !(dptr->conn->fs_capabilities & FILE_CASE_SENSITIVE_SEARCH))
+ {
+ goto clean;
+ }
- if (SMB_VFS_STAT(dptr->conn,pathreal,pst) == 0) {
- /* We need to set the underlying dir_hnd offset to -1 also as
- this function is usually called with the output from TellDir. */
- dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
- TALLOC_FREE(pathreal);
- return dptr->wcard;
- } else {
- /* If we get any other error than ENOENT or ENOTDIR
- then the file exists we just can't stat it. */
- if (errno != ENOENT && errno != ENOTDIR) {
- /* We need to set the underlying dir_hdn offset to -1 also as
- this function is usually called with the output from TellDir. */
- dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
- TALLOC_FREE(pathreal);
- return dptr->wcard;
- }
- }
+ /*
+ * Try case-insensitive stat if the fs has the ability. This avoids
+ * scanning the whole directory.
+ */
+ ret = SMB_VFS_GET_REAL_FILENAME(dptr->conn, dptr->path, dptr->wcard,
+ ctx, &found_name);
+ if (ret == 0) {
+ name = found_name;
+ goto clean;
+ } else if (errno == ENOENT) {
+ /* The case-insensitive lookup was authoritative. */
+ goto clean;
+ }
- TALLOC_FREE(pathreal);
+ TALLOC_FREE(pathreal);
- /* Stat failed. We know this is authoratiative if we are
- * providing case sensitive semantics or the underlying
- * filesystem is case sensitive.
- */
+ name_temp = dptr_normal_ReadDirName(dptr, poffset, pst);
+ name = talloc_strdup(ctx, name_temp);
+ return name;
- if (dptr->conn->case_sensitive ||
- !(dptr->conn->fs_capabilities & FILE_CASE_SENSITIVE_SEARCH)) {
- /* We need to set the underlying dir_hnd offset to -1 also as
- this function is usually called with the output from TellDir. */
- dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
- return NULL;
- }
- }
- return dptr_normal_ReadDirName(dptr, poffset, pst);
+clean:
+ TALLOC_FREE(pathreal);
+ret:
+ /* We need to set the underlying dir_hnd offset to -1
+ * also as this function is usually called with the
+ * output from TellDir. */
+ dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
+ return name;
}
/****************************************************************************
DirCacheAdd(dptr->dir_hnd, name, offset);
}
+/****************************************************************************
+ Initialize variables & state data at the beginning of all search SMB requests.
+****************************************************************************/
+void dptr_init_search_op(struct dptr_struct *dptr)
+{
+ SMB_VFS_INIT_SEARCH_OP(dptr->conn, dptr->dir_hnd->dir);
+}
+
/****************************************************************************
Fill the 5 byte server reserved dptr field.
****************************************************************************/
char **pp_fname_out,
SMB_OFF_T *size,
uint32 *mode,
- time_t *date,
+ struct timespec *date,
bool check_descend,
bool ask_sharemode)
{
- const char *dname = NULL;
+ char *dname = NULL;
bool found = False;
SMB_STRUCT_STAT sbuf;
char *pathreal = NULL;
- const char *filename = NULL;
+ char *filename = NULL;
bool needslash;
*pp_fname_out = NULL;
if (!mangle_is_8_3(filename, False, conn->params)) {
if (!name_to_8_3(filename,mname,False,
conn->params)) {
+ TALLOC_FREE(filename);
continue;
}
- filename = mname;
+ filename = talloc_strdup(ctx, mname);
+ if (!filename) {
+ return False;
+ }
}
if (needslash) {
dname);
}
if (!pathreal) {
+ TALLOC_FREE(filename);
return False;
}
- if (!VALID_STAT(sbuf) && (SMB_VFS_STAT(conn, pathreal, &sbuf)) != 0) {
- DEBUG(5,("Couldn't stat 1 [%s]. Error = %s\n",
- pathreal, strerror(errno) ));
- TALLOC_FREE(pathreal);
- continue;
+ if (!VALID_STAT(sbuf)) {
+ struct smb_filename *smb_fname = NULL;
+ NTSTATUS status;
+
+ /* Create smb_fname with NULL stream_name. */
+ status =
+ create_synthetic_smb_fname(ctx, pathreal,
+ NULL, NULL,
+ &smb_fname);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(pathreal);
+ TALLOC_FREE(filename);
+ return NULL;
+ }
+
+ if ((SMB_VFS_STAT(conn, smb_fname)) != 0) {
+ DEBUG(5,("Couldn't stat 1 [%s]. Error "
+ "= %s\n", pathreal,
+ strerror(errno)));
+ TALLOC_FREE(smb_fname);
+ TALLOC_FREE(pathreal);
+ TALLOC_FREE(filename);
+ continue;
+ }
+ sbuf = smb_fname->st;
+ TALLOC_FREE(smb_fname);
}
*mode = dos_mode(conn,pathreal,&sbuf);
if (!dir_check_ftype(conn,*mode,dirtype)) {
DEBUG(5,("[%s] attribs 0x%x didn't match 0x%x\n",filename,(unsigned int)*mode,(unsigned int)dirtype));
TALLOC_FREE(pathreal);
+ TALLOC_FREE(filename);
continue;
}
- *size = sbuf.st_size;
- *date = sbuf.st_mtime;
+ *size = sbuf.st_ex_size;
+ *date = sbuf.st_ex_mtime;
if (ask_sharemode) {
struct timespec write_time_ts;
fileid = vfs_file_id_from_sbuf(conn, &sbuf);
get_file_infos(fileid, NULL, &write_time_ts);
if (!null_timespec(write_time_ts)) {
- *date = convert_timespec_to_time_t(write_time_ts);
+ *date = write_time_ts;
}
}
found = True;
- *pp_fname_out = talloc_strdup(ctx, filename);
- if (!*pp_fname_out) {
- return False;
- }
+ SMB_ASSERT(filename != NULL);
+ *pp_fname_out = filename;
DirCacheAdd(conn->dirptr->dir_hnd, dname, curoff);
TALLOC_FREE(pathreal);
}
+
+ if (!found)
+ TALLOC_FREE(filename);
}
return(found);
use it for anything security sensitive.
********************************************************************/
-static bool user_can_read_file(connection_struct *conn, char *name)
+static bool user_can_read_file(connection_struct *conn,
+ struct smb_filename *smb_fname)
{
/*
* If user is a member of the Admin group
return True;
}
- return can_access_file_acl(conn, name, FILE_READ_DATA);
+ return can_access_file_acl(conn, smb_fname, FILE_READ_DATA);
}
/*******************************************************************
use it for anything security sensitive.
********************************************************************/
-static bool user_can_write_file(connection_struct *conn, char *name, SMB_STRUCT_STAT *pst)
+static bool user_can_write_file(connection_struct *conn,
+ const struct smb_filename *smb_fname)
{
/*
* If user is a member of the Admin group
return True;
}
- SMB_ASSERT(VALID_STAT(*pst));
+ SMB_ASSERT(VALID_STAT(smb_fname->st));
/* Pseudo-open the file */
- if(S_ISDIR(pst->st_mode)) {
+ if(S_ISDIR(smb_fname->st.st_ex_mode)) {
return True;
}
- return can_write_to_file(conn, name, pst);
+ return can_write_to_file(conn, smb_fname);
}
/*******************************************************************
Is a file a "special" type ?
********************************************************************/
-static bool file_is_special(connection_struct *conn, char *name, SMB_STRUCT_STAT *pst)
+static bool file_is_special(connection_struct *conn,
+ const struct smb_filename *smb_fname)
{
/*
* If user is a member of the Admin group
if (conn->admin_user)
return False;
- SMB_ASSERT(VALID_STAT(*pst));
+ SMB_ASSERT(VALID_STAT(smb_fname->st));
- if (S_ISREG(pst->st_mode) || S_ISDIR(pst->st_mode) || S_ISLNK(pst->st_mode))
+ if (S_ISREG(smb_fname->st.st_ex_mode) ||
+ S_ISDIR(smb_fname->st.st_ex_mode) ||
+ S_ISLNK(smb_fname->st.st_ex_mode))
return False;
return True;
}
/*******************************************************************
- Should the file be seen by the client ? NOTE: A successful return
- is no guarantee of the file's existence ... you also have to check
- whether pst is valid.
+ Should the file be seen by the client?
+ NOTE: A successful return is no guarantee of the file's existence.
********************************************************************/
-bool is_visible_file(connection_struct *conn, const char *dir_path, const char *name, SMB_STRUCT_STAT *pst, bool use_veto)
+bool is_visible_file(connection_struct *conn, const char *dir_path,
+ const char *name, SMB_STRUCT_STAT *pst, bool use_veto)
{
bool hide_unreadable = lp_hideunreadable(SNUM(conn));
bool hide_unwriteable = lp_hideunwriteable_files(SNUM(conn));
bool hide_special = lp_hide_special_files(SNUM(conn));
-
- SET_STAT_INVALID(*pst);
+ char *entry = NULL;
+ struct smb_filename *smb_fname_base = NULL;
+ NTSTATUS status;
+ bool ret = false;
if ((strcmp(".",name) == 0) || (strcmp("..",name) == 0)) {
return True; /* . and .. are always visible. */
}
if (hide_unreadable || hide_unwriteable || hide_special) {
- char *entry = NULL;
-
- if (asprintf(&entry, "%s/%s", dir_path, name) == -1) {
- return False;
+ entry = talloc_asprintf(talloc_tos(), "%s/%s", dir_path, name);
+ if (!entry) {
+ ret = false;
+ goto out;
}
/* If it's a dfs symlink, ignore _hide xxxx_ options */
if (lp_host_msdfs() &&
lp_msdfs_root(SNUM(conn)) &&
is_msdfs_link(conn, entry, NULL)) {
- SAFE_FREE(entry);
- return True;
+ ret = true;
+ goto out;
+ }
+
+ /* Create an smb_filename with stream_name == NULL. */
+ status = create_synthetic_smb_fname(talloc_tos(), entry, NULL,
+ pst, &smb_fname_base);
+ if (!NT_STATUS_IS_OK(status)) {
+ ret = false;
+ goto out;
}
/* If the file name does not exist, there's no point checking
* the configuration options. We succeed, on the basis that the
* checks *might* have passed if the file was present.
*/
- if (SMB_VFS_STAT(conn, entry, pst) != 0) {
- SAFE_FREE(entry);
- return True;
+ if (!VALID_STAT(*pst)) {
+ if (SMB_VFS_STAT(conn, smb_fname_base) != 0) {
+ ret = true;
+ goto out;
+ } else {
+ *pst = smb_fname_base->st;
+ }
}
/* Honour _hide unreadable_ option */
- 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;
+ if (hide_unreadable &&
+ !user_can_read_file(conn, smb_fname_base)) {
+ DEBUG(10,("is_visible_file: file %s is unreadable.\n",
+ entry ));
+ ret = false;
+ goto out;
}
/* Honour _hide unwriteable_ option */
- if (hide_unwriteable && !user_can_write_file(conn, entry, pst)) {
- DEBUG(10,("is_visible_file: file %s is unwritable.\n", entry ));
- SAFE_FREE(entry);
- return False;
+ if (hide_unwriteable && !user_can_write_file(conn,
+ smb_fname_base)) {
+ DEBUG(10,("is_visible_file: file %s is unwritable.\n",
+ entry ));
+ ret = false;
+ goto out;
}
/* Honour _hide_special_ option */
- if (hide_special && file_is_special(conn, entry, pst)) {
- DEBUG(10,("is_visible_file: file %s is special.\n", entry ));
- SAFE_FREE(entry);
- return False;
+ if (hide_special && file_is_special(conn, smb_fname_base)) {
+ DEBUG(10,("is_visible_file: file %s is special.\n",
+ entry ));
+ ret = false;
+ goto out;
}
- SAFE_FREE(entry);
}
- return True;
+
+ ret = true;
+ out:
+ TALLOC_FREE(smb_fname_base);
+ TALLOC_FREE(entry);
+ return ret;
}
static int smb_Dir_destructor(struct smb_Dir *dirp)
}
/*******************************************************************
- Read from a directory. Also return current offset.
+ Read from a directory.
+ Return directory entry, current offset, and optional stat information.
Don't check for veto or invisible files.
********************************************************************/
-const char *ReadDirName(struct smb_Dir *dirp, long *poffset)
+const char *ReadDirName(struct smb_Dir *dirp, long *poffset,
+ SMB_STRUCT_STAT *sbuf)
{
const char *n;
connection_struct *conn = dirp->conn;
/* Cheat to allow . and .. to be the first entries returned. */
- if (((*poffset == START_OF_DIRECTORY_OFFSET) || (*poffset == DOT_DOT_DIRECTORY_OFFSET)) && (dirp->file_number < 2)) {
+ if (((*poffset == START_OF_DIRECTORY_OFFSET) ||
+ (*poffset == DOT_DOT_DIRECTORY_OFFSET)) && (dirp->file_number < 2))
+ {
if (dirp->file_number == 0) {
n = ".";
*poffset = dirp->offset = START_OF_DIRECTORY_OFFSET;
SeekDir(dirp, *poffset);
}
- while ((n = vfs_readdirname(conn, dirp->dir))) {
+ while ((n = vfs_readdirname(conn, dirp->dir, sbuf))) {
/* Ignore . and .. - we've already returned them. */
if (*n == '.') {
if ((n[1] == '\0') || (n[1] == '.' && n[2] == '\0')) {
SMB_VFS_REWINDDIR(conn, dirp->dir);
dirp->file_number = 0;
*poffset = START_OF_DIRECTORY_OFFSET;
- while ((entry = ReadDirName(dirp, poffset))) {
+ while ((entry = ReadDirName(dirp, poffset, NULL))) {
if (conn->case_sensitive ? (strcmp(entry, name) == 0) : strequal(entry, name)) {
return True;
}
NTSTATUS status = NT_STATUS_OK;
long dirpos = 0;
const char *dname;
+ SMB_STRUCT_STAT st;
struct smb_Dir *dir_hnd = OpenDir(talloc_tos(), conn, dirname,
NULL, 0);
return map_nt_error_from_unix(errno);
}
- while ((dname = ReadDirName(dir_hnd,&dirpos))) {
- SMB_STRUCT_STAT st;
-
+ while ((dname = ReadDirName(dir_hnd, &dirpos, &st))) {
/* Quick check for "." and ".." */
if (dname[0] == '.') {
if (!dname[1] || (dname[1] == '.' && !dname[2])) {
continue;
}
- DEBUG(10,("can_delete_directory: got name %s - can't delete\n", dname ));
+ DEBUG(10,("can_delete_directory: got name %s - can't delete\n",
+ dname ));
status = NT_STATUS_DIRECTORY_NOT_EMPTY;
break;
}
git.samba.org / ira / wip.git / blobdiff