DEBUG(5, ("vfs module [%s] not loaded - trying to load...\n",
vfs_object));
- status = smb_probe_module("vfs", module_path);
+ status = smb_load_module("vfs", module_path);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("error probing vfs module '%s': %s\n",
module_path, nt_errstr(status)));
if (!p)
return(NULL);
- ptr = SMB_VFS_READDIR(conn, (DIR *)p, sbuf);
+ ptr = SMB_VFS_READDIR(conn, (SMB_STRUCT_DIR *)p, sbuf);
if (!ptr)
return(NULL);
return result;
}
+/*******************************************************************
+ Reduce a file name, removing .. elements and checking that
+ it is below dir in the heirachy. This uses realpath.
+ This function must run as root, and will return names
+ and valid stat structs that can be checked on open.
+********************************************************************/
+
+NTSTATUS check_reduced_name_with_privilege(connection_struct *conn,
+ const char *fname,
+ struct smb_request *smbreq)
+{
+ NTSTATUS status;
+ TALLOC_CTX *ctx = talloc_tos();
+ const char *conn_rootdir;
+ size_t rootdir_len;
+ char *dir_name = NULL;
+ const char *last_component = NULL;
+ char *resolved_name = NULL;
+ char *saved_dir = NULL;
+ struct smb_filename *smb_fname_cwd = NULL;
+ struct privilege_paths *priv_paths = NULL;
+ int ret;
+
+ DEBUG(3,("check_reduced_name_with_privilege [%s] [%s]\n",
+ fname,
+ conn->connectpath));
+
+
+ priv_paths = talloc_zero(smbreq, struct privilege_paths);
+ if (!priv_paths) {
+ status = NT_STATUS_NO_MEMORY;
+ goto err;
+ }
+
+ if (!parent_dirname(ctx, fname, &dir_name, &last_component)) {
+ status = NT_STATUS_NO_MEMORY;
+ goto err;
+ }
+
+ priv_paths->parent_name.base_name = talloc_strdup(priv_paths, dir_name);
+ priv_paths->file_name.base_name = talloc_strdup(priv_paths, last_component);
+
+ if (priv_paths->parent_name.base_name == NULL ||
+ priv_paths->file_name.base_name == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto err;
+ }
+
+ if (SMB_VFS_STAT(conn, &priv_paths->parent_name) != 0) {
+ status = map_nt_error_from_unix(errno);
+ goto err;
+ }
+ /* Remember where we were. */
+ saved_dir = vfs_GetWd(ctx, conn);
+ if (!saved_dir) {
+ status = map_nt_error_from_unix(errno);
+ goto err;
+ }
+
+ /* Go to the parent directory to lock in memory. */
+ if (vfs_ChDir(conn, priv_paths->parent_name.base_name) == -1) {
+ status = map_nt_error_from_unix(errno);
+ goto err;
+ }
+
+ /* Get the absolute path of the parent directory. */
+ resolved_name = SMB_VFS_REALPATH(conn,".");
+ if (!resolved_name) {
+ status = map_nt_error_from_unix(errno);
+ goto err;
+ }
+
+ if (*resolved_name != '/') {
+ DEBUG(0,("check_reduced_name_with_privilege: realpath "
+ "doesn't return absolute paths !\n"));
+ status = NT_STATUS_OBJECT_NAME_INVALID;
+ goto err;
+ }
+
+ DEBUG(10,("check_reduced_name_with_privilege: realpath [%s] -> [%s]\n",
+ priv_paths->parent_name.base_name,
+ resolved_name));
+
+ /* Now check the stat value is the same. */
+ status = create_synthetic_smb_fname(talloc_tos(), ".",
+ NULL, NULL,
+ &smb_fname_cwd);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto err;
+ }
+
+ if (SMB_VFS_LSTAT(conn, smb_fname_cwd) != 0) {
+ status = map_nt_error_from_unix(errno);
+ goto err;
+ }
+
+ /* Ensure we're pointing at the same place. */
+ if (!check_same_stat(&smb_fname_cwd->st, &priv_paths->parent_name.st)) {
+ DEBUG(0,("check_reduced_name_with_privilege: "
+ "device/inode/uid/gid on directory %s changed. "
+ "Denying access !\n",
+ priv_paths->parent_name.base_name));
+ status = NT_STATUS_ACCESS_DENIED;
+ goto err;
+ }
+
+ /* Ensure we're below the connect path. */
+
+ conn_rootdir = SMB_VFS_CONNECTPATH(conn, fname);
+ if (conn_rootdir == NULL) {
+ DEBUG(2, ("check_reduced_name_with_privilege: Could not get "
+ "conn_rootdir\n"));
+ status = NT_STATUS_ACCESS_DENIED;
+ goto err;
+ }
+
+ rootdir_len = strlen(conn_rootdir);
+ if (strncmp(conn_rootdir, resolved_name, rootdir_len) != 0) {
+ DEBUG(2, ("check_reduced_name_with_privilege: Bad access "
+ "attempt: %s is a symlink outside the "
+ "share path\n",
+ dir_name));
+ DEBUGADD(2, ("conn_rootdir =%s\n", conn_rootdir));
+ DEBUGADD(2, ("resolved_name=%s\n", resolved_name));
+ status = NT_STATUS_ACCESS_DENIED;
+ goto err;
+ }
+
+ /* Now ensure that the last component either doesn't
+ exist, or is *NOT* a symlink. */
+
+ ret = SMB_VFS_LSTAT(conn, &priv_paths->file_name);
+ if (ret == -1) {
+ /* Errno must be ENOENT for this be ok. */
+ if (errno != ENOENT) {
+ status = map_nt_error_from_unix(errno);
+ DEBUG(2, ("check_reduced_name_with_privilege: "
+ "LSTAT on %s failed with %s\n",
+ priv_paths->file_name.base_name,
+ nt_errstr(status)));
+ goto err;
+ }
+ }
+
+ if (VALID_STAT(priv_paths->file_name.st) &&
+ S_ISLNK(priv_paths->file_name.st.st_ex_mode)) {
+ DEBUG(2, ("check_reduced_name_with_privilege: "
+ "Last component %s is a symlink. Denying"
+ "access.\n",
+ priv_paths->file_name.base_name));
+ status = NT_STATUS_ACCESS_DENIED;
+ goto err;
+ }
+
+ smbreq->priv_paths = priv_paths;
+ status = NT_STATUS_OK;
+
+ err:
+
+ if (saved_dir) {
+ vfs_ChDir(conn, saved_dir);
+ }
+ SAFE_FREE(resolved_name);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(priv_paths);
+ }
+ return status;
+}
+
/*******************************************************************
Reduce a file name, removing .. elements and checking that
it is below dir in the heirachy. This uses realpath.
return NT_STATUS_OK;
}
+/**
+ * Initialize num_streams and streams, then call VFS op streaminfo
+ */
+NTSTATUS vfs_streaminfo(connection_struct *conn,
+ struct files_struct *fsp,
+ const char *fname,
+ TALLOC_CTX *mem_ctx,
+ unsigned int *num_streams,
+ struct stream_struct **streams)
+{
+ *num_streams = 0;
+ *streams = NULL;
+ return SMB_VFS_STREAMINFO(conn, fsp, fname, mem_ctx, num_streams, streams);
+}
+
/*
generate a file_id from a stat structure
*/
int smb_vfs_call_connect(struct vfs_handle_struct *handle,
const char *service, const char *user)
{
- VFS_FIND(connect_fn);
+ VFS_FIND(connect);
return handle->fns->connect_fn(handle, service, user);
}
void smb_vfs_call_disconnect(struct vfs_handle_struct *handle)
{
VFS_FIND(disconnect);
- handle->fns->disconnect(handle);
+ handle->fns->disconnect_fn(handle);
}
uint64_t smb_vfs_call_disk_free(struct vfs_handle_struct *handle,
uint64_t *dsize)
{
VFS_FIND(disk_free);
- return handle->fns->disk_free(handle, path, small_query, bsize, dfree,
- dsize);
+ return handle->fns->disk_free_fn(handle, path, small_query, bsize,
+ dfree, dsize);
}
int smb_vfs_call_get_quota(struct vfs_handle_struct *handle,
SMB_DISK_QUOTA *qt)
{
VFS_FIND(get_quota);
- return handle->fns->get_quota(handle, qtype, id, qt);
+ return handle->fns->get_quota_fn(handle, qtype, id, qt);
}
int smb_vfs_call_set_quota(struct vfs_handle_struct *handle,
SMB_DISK_QUOTA *qt)
{
VFS_FIND(set_quota);
- return handle->fns->set_quota(handle, qtype, id, qt);
+ return handle->fns->set_quota_fn(handle, qtype, id, qt);
}
int smb_vfs_call_get_shadow_copy_data(struct vfs_handle_struct *handle,
bool labels)
{
VFS_FIND(get_shadow_copy_data);
- return handle->fns->get_shadow_copy_data(handle, fsp, shadow_copy_data,
- labels);
+ return handle->fns->get_shadow_copy_data_fn(handle, fsp,
+ shadow_copy_data,
+ labels);
}
int smb_vfs_call_statvfs(struct vfs_handle_struct *handle, const char *path,
struct vfs_statvfs_struct *statbuf)
{
VFS_FIND(statvfs);
- return handle->fns->statvfs(handle, path, statbuf);
+ return handle->fns->statvfs_fn(handle, path, statbuf);
}
uint32_t smb_vfs_call_fs_capabilities(struct vfs_handle_struct *handle,
enum timestamp_set_resolution *p_ts_res)
{
VFS_FIND(fs_capabilities);
- return handle->fns->fs_capabilities(handle, p_ts_res);
+ return handle->fns->fs_capabilities_fn(handle, p_ts_res);
+}
+
+NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle,
+ struct dfs_GetDFSReferral *r)
+{
+ VFS_FIND(get_dfs_referrals);
+ return handle->fns->get_dfs_referrals_fn(handle, r);
}
SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
uint32 attributes)
{
VFS_FIND(opendir);
- return handle->fns->opendir(handle, fname, mask, attributes);
+ return handle->fns->opendir_fn(handle, fname, mask, attributes);
}
SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
uint32 attributes)
{
VFS_FIND(fdopendir);
- return handle->fns->fdopendir(handle, fsp, mask, attributes);
+ return handle->fns->fdopendir_fn(handle, fsp, mask, attributes);
}
SMB_STRUCT_DIRENT *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
SMB_STRUCT_STAT *sbuf)
{
VFS_FIND(readdir);
- return handle->fns->readdir(handle, dirp, sbuf);
+ return handle->fns->readdir_fn(handle, dirp, sbuf);
}
void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp, long offset)
{
VFS_FIND(seekdir);
- handle->fns->seekdir(handle, dirp, offset);
+ handle->fns->seekdir_fn(handle, dirp, offset);
}
long smb_vfs_call_telldir(struct vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
{
VFS_FIND(telldir);
- return handle->fns->telldir(handle, dirp);
+ return handle->fns->telldir_fn(handle, dirp);
}
void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
{
VFS_FIND(rewind_dir);
- handle->fns->rewind_dir(handle, dirp);
+ handle->fns->rewind_dir_fn(handle, dirp);
}
int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
mode_t mode)
{
VFS_FIND(mkdir);
- return handle->fns->mkdir(handle, path, mode);
+ return handle->fns->mkdir_fn(handle, path, mode);
}
int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path)
{
VFS_FIND(rmdir);
- return handle->fns->rmdir(handle, path);
+ return handle->fns->rmdir_fn(handle, path);
}
int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
SMB_STRUCT_DIR *dir)
{
VFS_FIND(closedir);
- return handle->fns->closedir(handle, dir);
+ return handle->fns->closedir_fn(handle, dir);
}
void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
{
VFS_FIND(init_search_op);
- handle->fns->init_search_op(handle, dirp);
+ handle->fns->init_search_op_fn(handle, dirp);
}
int smb_vfs_call_open(struct vfs_handle_struct *handle,
struct smb_filename *smb_fname, struct files_struct *fsp,
int flags, mode_t mode)
{
- VFS_FIND(open_fn);
+ VFS_FIND(open);
return handle->fns->open_fn(handle, smb_fname, fsp, flags, mode);
}
int *pinfo)
{
VFS_FIND(create_file);
- return handle->fns->create_file(
+ return handle->fns->create_file_fn(
handle, req, root_dir_fid, smb_fname, access_mask,
share_access, create_disposition, create_options,
file_attributes, oplock_request, allocation_size,
result, pinfo);
}
-int smb_vfs_call_close_fn(struct vfs_handle_struct *handle,
- struct files_struct *fsp)
+int smb_vfs_call_close(struct vfs_handle_struct *handle,
+ struct files_struct *fsp)
{
- VFS_FIND(close_fn);
+ VFS_FIND(close);
return handle->fns->close_fn(handle, fsp);
}
-ssize_t smb_vfs_call_vfs_read(struct vfs_handle_struct *handle,
- struct files_struct *fsp, void *data, size_t n)
+ssize_t smb_vfs_call_read(struct vfs_handle_struct *handle,
+ struct files_struct *fsp, void *data, size_t n)
{
- VFS_FIND(vfs_read);
- return handle->fns->vfs_read(handle, fsp, data, n);
+ VFS_FIND(read);
+ return handle->fns->read_fn(handle, fsp, data, n);
}
ssize_t smb_vfs_call_pread(struct vfs_handle_struct *handle,
SMB_OFF_T offset)
{
VFS_FIND(pread);
- return handle->fns->pread(handle, fsp, data, n, offset);
+ return handle->fns->pread_fn(handle, fsp, data, n, offset);
}
ssize_t smb_vfs_call_write(struct vfs_handle_struct *handle,
size_t n)
{
VFS_FIND(write);
- return handle->fns->write(handle, fsp, data, n);
+ return handle->fns->write_fn(handle, fsp, data, n);
}
ssize_t smb_vfs_call_pwrite(struct vfs_handle_struct *handle,
size_t n, SMB_OFF_T offset)
{
VFS_FIND(pwrite);
- return handle->fns->pwrite(handle, fsp, data, n, offset);
+ return handle->fns->pwrite_fn(handle, fsp, data, n, offset);
}
SMB_OFF_T smb_vfs_call_lseek(struct vfs_handle_struct *handle,
int whence)
{
VFS_FIND(lseek);
- return handle->fns->lseek(handle, fsp, offset, whence);
+ return handle->fns->lseek_fn(handle, fsp, offset, whence);
}
ssize_t smb_vfs_call_sendfile(struct vfs_handle_struct *handle, int tofd,
SMB_OFF_T offset, size_t count)
{
VFS_FIND(sendfile);
- return handle->fns->sendfile(handle, tofd, fromfsp, header, offset,
- count);
+ return handle->fns->sendfile_fn(handle, tofd, fromfsp, header, offset,
+ count);
}
ssize_t smb_vfs_call_recvfile(struct vfs_handle_struct *handle, int fromfd,
size_t count)
{
VFS_FIND(recvfile);
- return handle->fns->recvfile(handle, fromfd, tofsp, offset, count);
+ return handle->fns->recvfile_fn(handle, fromfd, tofsp, offset, count);
}
int smb_vfs_call_rename(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname_dst)
{
VFS_FIND(rename);
- return handle->fns->rename(handle, smb_fname_src, smb_fname_dst);
+ return handle->fns->rename_fn(handle, smb_fname_src, smb_fname_dst);
}
int smb_vfs_call_fsync(struct vfs_handle_struct *handle,
struct files_struct *fsp)
{
VFS_FIND(fsync);
- return handle->fns->fsync(handle, fsp);
+ return handle->fns->fsync_fn(handle, fsp);
}
int smb_vfs_call_stat(struct vfs_handle_struct *handle,
struct smb_filename *smb_fname)
{
VFS_FIND(stat);
- return handle->fns->stat(handle, smb_fname);
+ return handle->fns->stat_fn(handle, smb_fname);
}
int smb_vfs_call_fstat(struct vfs_handle_struct *handle,
struct files_struct *fsp, SMB_STRUCT_STAT *sbuf)
{
VFS_FIND(fstat);
- return handle->fns->fstat(handle, fsp, sbuf);
+ return handle->fns->fstat_fn(handle, fsp, sbuf);
}
int smb_vfs_call_lstat(struct vfs_handle_struct *handle,
struct smb_filename *smb_filename)
{
VFS_FIND(lstat);
- return handle->fns->lstat(handle, smb_filename);
+ return handle->fns->lstat_fn(handle, smb_filename);
}
uint64_t smb_vfs_call_get_alloc_size(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
VFS_FIND(get_alloc_size);
- return handle->fns->get_alloc_size(handle, fsp, sbuf);
+ return handle->fns->get_alloc_size_fn(handle, fsp, sbuf);
}
int smb_vfs_call_unlink(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname)
{
VFS_FIND(unlink);
- return handle->fns->unlink(handle, smb_fname);
+ return handle->fns->unlink_fn(handle, smb_fname);
}
int smb_vfs_call_chmod(struct vfs_handle_struct *handle, const char *path,
mode_t mode)
{
VFS_FIND(chmod);
- return handle->fns->chmod(handle, path, mode);
+ return handle->fns->chmod_fn(handle, path, mode);
}
int smb_vfs_call_fchmod(struct vfs_handle_struct *handle,
struct files_struct *fsp, mode_t mode)
{
VFS_FIND(fchmod);
- return handle->fns->fchmod(handle, fsp, mode);
+ return handle->fns->fchmod_fn(handle, fsp, mode);
}
int smb_vfs_call_chown(struct vfs_handle_struct *handle, const char *path,
uid_t uid, gid_t gid)
{
VFS_FIND(chown);
- return handle->fns->chown(handle, path, uid, gid);
+ return handle->fns->chown_fn(handle, path, uid, gid);
}
int smb_vfs_call_fchown(struct vfs_handle_struct *handle,
struct files_struct *fsp, uid_t uid, gid_t gid)
{
VFS_FIND(fchown);
- return handle->fns->fchown(handle, fsp, uid, gid);
+ return handle->fns->fchown_fn(handle, fsp, uid, gid);
}
int smb_vfs_call_lchown(struct vfs_handle_struct *handle, const char *path,
uid_t uid, gid_t gid)
{
VFS_FIND(lchown);
- return handle->fns->lchown(handle, path, uid, gid);
+ return handle->fns->lchown_fn(handle, path, uid, gid);
}
NTSTATUS vfs_chown_fsp(files_struct *fsp, uid_t uid, gid_t gid)
}
/* cd into the parent dir to pin it. */
- ret = SMB_VFS_CHDIR(fsp->conn, parent_dir);
+ ret = vfs_ChDir(fsp->conn, parent_dir);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
/* Must use lstat here. */
ret = SMB_VFS_LSTAT(fsp->conn, &local_fname);
if (ret == -1) {
- return map_nt_error_from_unix(errno);
+ status = map_nt_error_from_unix(errno);
+ goto out;
}
/* Ensure it matches the fsp stat. */
if (!check_same_stat(&local_fname.st, &fsp->fsp_name->st)) {
- return NT_STATUS_ACCESS_DENIED;
+ status = NT_STATUS_ACCESS_DENIED;
+ goto out;
}
path = final_component;
} else {
status = map_nt_error_from_unix(errno);
}
+ out:
+
if (as_root) {
vfs_ChDir(fsp->conn,saved_dir);
TALLOC_FREE(saved_dir);
int smb_vfs_call_chdir(struct vfs_handle_struct *handle, const char *path)
{
VFS_FIND(chdir);
- return handle->fns->chdir(handle, path);
+ return handle->fns->chdir_fn(handle, path);
}
char *smb_vfs_call_getwd(struct vfs_handle_struct *handle)
{
VFS_FIND(getwd);
- return handle->fns->getwd(handle);
+ return handle->fns->getwd_fn(handle);
}
int smb_vfs_call_ntimes(struct vfs_handle_struct *handle,
struct smb_file_time *ft)
{
VFS_FIND(ntimes);
- return handle->fns->ntimes(handle, smb_fname, ft);
+ return handle->fns->ntimes_fn(handle, smb_fname, ft);
}
int smb_vfs_call_ftruncate(struct vfs_handle_struct *handle,
struct files_struct *fsp, SMB_OFF_T offset)
{
VFS_FIND(ftruncate);
- return handle->fns->ftruncate(handle, fsp, offset);
+ return handle->fns->ftruncate_fn(handle, fsp, offset);
}
int smb_vfs_call_fallocate(struct vfs_handle_struct *handle,
SMB_OFF_T len)
{
VFS_FIND(fallocate);
- return handle->fns->fallocate(handle, fsp, mode, offset, len);
+ return handle->fns->fallocate_fn(handle, fsp, mode, offset, len);
}
int smb_vfs_call_kernel_flock(struct vfs_handle_struct *handle,
uint32_t access_mask)
{
VFS_FIND(kernel_flock);
- return handle->fns->kernel_flock(handle, fsp, share_mode,
+ return handle->fns->kernel_flock_fn(handle, fsp, share_mode,
access_mask);
}
struct files_struct *fsp, int leasetype)
{
VFS_FIND(linux_setlease);
- return handle->fns->linux_setlease(handle, fsp, leasetype);
+ return handle->fns->linux_setlease_fn(handle, fsp, leasetype);
}
int smb_vfs_call_symlink(struct vfs_handle_struct *handle, const char *oldpath,
const char *newpath)
{
VFS_FIND(symlink);
- return handle->fns->symlink(handle, oldpath, newpath);
+ return handle->fns->symlink_fn(handle, oldpath, newpath);
}
-int smb_vfs_call_vfs_readlink(struct vfs_handle_struct *handle,
+int smb_vfs_call_readlink(struct vfs_handle_struct *handle,
const char *path, char *buf, size_t bufsiz)
{
- VFS_FIND(vfs_readlink);
- return handle->fns->vfs_readlink(handle, path, buf, bufsiz);
+ VFS_FIND(readlink);
+ return handle->fns->readlink_fn(handle, path, buf, bufsiz);
}
int smb_vfs_call_link(struct vfs_handle_struct *handle, const char *oldpath,
const char *newpath)
{
VFS_FIND(link);
- return handle->fns->link(handle, oldpath, newpath);
+ return handle->fns->link_fn(handle, oldpath, newpath);
}
int smb_vfs_call_mknod(struct vfs_handle_struct *handle, const char *path,
mode_t mode, SMB_DEV_T dev)
{
VFS_FIND(mknod);
- return handle->fns->mknod(handle, path, mode, dev);
+ return handle->fns->mknod_fn(handle, path, mode, dev);
}
char *smb_vfs_call_realpath(struct vfs_handle_struct *handle, const char *path)
{
VFS_FIND(realpath);
- return handle->fns->realpath(handle, path);
+ return handle->fns->realpath_fn(handle, path);
}
NTSTATUS smb_vfs_call_notify_watch(struct vfs_handle_struct *handle,
struct sys_notify_context *ctx,
- struct notify_entry *e,
+ const char *path,
+ uint32_t *filter,
+ uint32_t *subdir_filter,
void (*callback)(struct sys_notify_context *ctx,
void *private_data,
struct notify_event *ev),
void *private_data, void *handle_p)
{
VFS_FIND(notify_watch);
- return handle->fns->notify_watch(handle, ctx, e, callback,
- private_data, handle_p);
+ return handle->fns->notify_watch_fn(handle, ctx, path,
+ filter, subdir_filter, callback,
+ private_data, handle_p);
}
int smb_vfs_call_chflags(struct vfs_handle_struct *handle, const char *path,
unsigned int flags)
{
VFS_FIND(chflags);
- return handle->fns->chflags(handle, path, flags);
+ return handle->fns->chflags_fn(handle, path, flags);
}
struct file_id smb_vfs_call_file_id_create(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
VFS_FIND(file_id_create);
- return handle->fns->file_id_create(handle, sbuf);
+ return handle->fns->file_id_create_fn(handle, sbuf);
}
NTSTATUS smb_vfs_call_streaminfo(struct vfs_handle_struct *handle,
struct stream_struct **streams)
{
VFS_FIND(streaminfo);
- return handle->fns->streaminfo(handle, fsp, fname, mem_ctx,
- num_streams, streams);
+ return handle->fns->streaminfo_fn(handle, fsp, fname, mem_ctx,
+ num_streams, streams);
}
int smb_vfs_call_get_real_filename(struct vfs_handle_struct *handle,
TALLOC_CTX *mem_ctx, char **found_name)
{
VFS_FIND(get_real_filename);
- return handle->fns->get_real_filename(handle, path, name, mem_ctx,
- found_name);
+ return handle->fns->get_real_filename_fn(handle, path, name, mem_ctx,
+ found_name);
}
const char *smb_vfs_call_connectpath(struct vfs_handle_struct *handle,
const char *filename)
{
VFS_FIND(connectpath);
- return handle->fns->connectpath(handle, filename);
+ return handle->fns->connectpath_fn(handle, filename);
}
bool smb_vfs_call_strict_lock(struct vfs_handle_struct *handle,
struct lock_struct *plock)
{
VFS_FIND(strict_lock);
- return handle->fns->strict_lock(handle, fsp, plock);
+ return handle->fns->strict_lock_fn(handle, fsp, plock);
}
void smb_vfs_call_strict_unlock(struct vfs_handle_struct *handle,
struct lock_struct *plock)
{
VFS_FIND(strict_unlock);
- handle->fns->strict_unlock(handle, fsp, plock);
+ handle->fns->strict_unlock_fn(handle, fsp, plock);
}
NTSTATUS smb_vfs_call_translate_name(struct vfs_handle_struct *handle,
char **mapped_name)
{
VFS_FIND(translate_name);
- return handle->fns->translate_name(handle, name, direction, mem_ctx,
- mapped_name);
+ return handle->fns->translate_name_fn(handle, name, direction, mem_ctx,
+ mapped_name);
+}
+
+NTSTATUS smb_vfs_call_fsctl(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ TALLOC_CTX *ctx,
+ uint32_t function,
+ uint16_t req_flags,
+ const uint8_t *in_data,
+ uint32_t in_len,
+ uint8_t **out_data,
+ uint32_t max_out_len,
+ uint32_t *out_len)
+{
+ VFS_FIND(fsctl);
+ return handle->fns->fsctl_fn(handle, fsp, ctx, function, req_flags,
+ in_data, in_len, out_data, max_out_len,
+ out_len);
}
NTSTATUS smb_vfs_call_fget_nt_acl(struct vfs_handle_struct *handle,
struct security_descriptor **ppdesc)
{
VFS_FIND(fget_nt_acl);
- return handle->fns->fget_nt_acl(handle, fsp, security_info,
- ppdesc);
+ return handle->fns->fget_nt_acl_fn(handle, fsp, security_info,
+ ppdesc);
}
NTSTATUS smb_vfs_call_get_nt_acl(struct vfs_handle_struct *handle,
struct security_descriptor **ppdesc)
{
VFS_FIND(get_nt_acl);
- return handle->fns->get_nt_acl(handle, name, security_info, ppdesc);
+ return handle->fns->get_nt_acl_fn(handle, name, security_info, ppdesc);
}
NTSTATUS smb_vfs_call_fset_nt_acl(struct vfs_handle_struct *handle,
const struct security_descriptor *psd)
{
VFS_FIND(fset_nt_acl);
- return handle->fns->fset_nt_acl(handle, fsp, security_info_sent, psd);
+ return handle->fns->fset_nt_acl_fn(handle, fsp, security_info_sent,
+ psd);
}
int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle, const char *name,
mode_t mode)
{
VFS_FIND(chmod_acl);
- return handle->fns->chmod_acl(handle, name, mode);
+ return handle->fns->chmod_acl_fn(handle, name, mode);
}
int smb_vfs_call_fchmod_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp, mode_t mode)
{
VFS_FIND(fchmod_acl);
- return handle->fns->fchmod_acl(handle, fsp, mode);
+ return handle->fns->fchmod_acl_fn(handle, fsp, mode);
}
int smb_vfs_call_sys_acl_get_entry(struct vfs_handle_struct *handle,
SMB_ACL_ENTRY_T *entry_p)
{
VFS_FIND(sys_acl_get_entry);
- return handle->fns->sys_acl_get_entry(handle, theacl, entry_id,
- entry_p);
+ return handle->fns->sys_acl_get_entry_fn(handle, theacl, entry_id,
+ entry_p);
}
int smb_vfs_call_sys_acl_get_tag_type(struct vfs_handle_struct *handle,
SMB_ACL_TAG_T *tag_type_p)
{
VFS_FIND(sys_acl_get_tag_type);
- return handle->fns->sys_acl_get_tag_type(handle, entry_d, tag_type_p);
+ return handle->fns->sys_acl_get_tag_type_fn(handle, entry_d,
+ tag_type_p);
}
int smb_vfs_call_sys_acl_get_permset(struct vfs_handle_struct *handle,
SMB_ACL_PERMSET_T *permset_p)
{
VFS_FIND(sys_acl_get_permset);
- return handle->fns->sys_acl_get_permset(handle, entry_d, permset_p);
+ return handle->fns->sys_acl_get_permset_fn(handle, entry_d, permset_p);
}
void * smb_vfs_call_sys_acl_get_qualifier(struct vfs_handle_struct *handle,
SMB_ACL_ENTRY_T entry_d)
{
VFS_FIND(sys_acl_get_qualifier);
- return handle->fns->sys_acl_get_qualifier(handle, entry_d);
+ return handle->fns->sys_acl_get_qualifier_fn(handle, entry_d);
}
SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle,
SMB_ACL_TYPE_T type)
{
VFS_FIND(sys_acl_get_file);
- return handle->fns->sys_acl_get_file(handle, path_p, type);
+ return handle->fns->sys_acl_get_file_fn(handle, path_p, type);
}
SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle,
struct files_struct *fsp)
{
VFS_FIND(sys_acl_get_fd);
- return handle->fns->sys_acl_get_fd(handle, fsp);
+ return handle->fns->sys_acl_get_fd_fn(handle, fsp);
}
int smb_vfs_call_sys_acl_clear_perms(struct vfs_handle_struct *handle,
SMB_ACL_PERMSET_T permset)
{
VFS_FIND(sys_acl_clear_perms);
- return handle->fns->sys_acl_clear_perms(handle, permset);
+ return handle->fns->sys_acl_clear_perms_fn(handle, permset);
}
int smb_vfs_call_sys_acl_add_perm(struct vfs_handle_struct *handle,
SMB_ACL_PERM_T perm)
{
VFS_FIND(sys_acl_add_perm);
- return handle->fns->sys_acl_add_perm(handle, permset, perm);
+ return handle->fns->sys_acl_add_perm_fn(handle, permset, perm);
}
char * smb_vfs_call_sys_acl_to_text(struct vfs_handle_struct *handle,
SMB_ACL_T theacl, ssize_t *plen)
{
VFS_FIND(sys_acl_to_text);
- return handle->fns->sys_acl_to_text(handle, theacl, plen);
+ return handle->fns->sys_acl_to_text_fn(handle, theacl, plen);
}
SMB_ACL_T smb_vfs_call_sys_acl_init(struct vfs_handle_struct *handle,
int count)
{
VFS_FIND(sys_acl_init);
- return handle->fns->sys_acl_init(handle, count);
+ return handle->fns->sys_acl_init_fn(handle, count);
}
int smb_vfs_call_sys_acl_create_entry(struct vfs_handle_struct *handle,
SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
{
VFS_FIND(sys_acl_create_entry);
- return handle->fns->sys_acl_create_entry(handle, pacl, pentry);
+ return handle->fns->sys_acl_create_entry_fn(handle, pacl, pentry);
}
int smb_vfs_call_sys_acl_set_tag_type(struct vfs_handle_struct *handle,
SMB_ACL_TAG_T tagtype)
{
VFS_FIND(sys_acl_set_tag_type);
- return handle->fns->sys_acl_set_tag_type(handle, entry, tagtype);
+ return handle->fns->sys_acl_set_tag_type_fn(handle, entry, tagtype);
}
int smb_vfs_call_sys_acl_set_qualifier(struct vfs_handle_struct *handle,
SMB_ACL_ENTRY_T entry, void *qual)
{
VFS_FIND(sys_acl_set_qualifier);
- return handle->fns->sys_acl_set_qualifier(handle, entry, qual);
+ return handle->fns->sys_acl_set_qualifier_fn(handle, entry, qual);
}
int smb_vfs_call_sys_acl_set_permset(struct vfs_handle_struct *handle,
SMB_ACL_PERMSET_T permset)
{
VFS_FIND(sys_acl_set_permset);
- return handle->fns->sys_acl_set_permset(handle, entry, permset);
+ return handle->fns->sys_acl_set_permset_fn(handle, entry, permset);
}
int smb_vfs_call_sys_acl_valid(struct vfs_handle_struct *handle,
SMB_ACL_T theacl)
{
VFS_FIND(sys_acl_valid);
- return handle->fns->sys_acl_valid(handle, theacl);
+ return handle->fns->sys_acl_valid_fn(handle, theacl);
}
int smb_vfs_call_sys_acl_set_file(struct vfs_handle_struct *handle,
SMB_ACL_T theacl)
{
VFS_FIND(sys_acl_set_file);
- return handle->fns->sys_acl_set_file(handle, name, acltype, theacl);
+ return handle->fns->sys_acl_set_file_fn(handle, name, acltype, theacl);
}
int smb_vfs_call_sys_acl_set_fd(struct vfs_handle_struct *handle,
struct files_struct *fsp, SMB_ACL_T theacl)
{
VFS_FIND(sys_acl_set_fd);
- return handle->fns->sys_acl_set_fd(handle, fsp, theacl);
+ return handle->fns->sys_acl_set_fd_fn(handle, fsp, theacl);
}
int smb_vfs_call_sys_acl_delete_def_file(struct vfs_handle_struct *handle,
const char *path)
{
VFS_FIND(sys_acl_delete_def_file);
- return handle->fns->sys_acl_delete_def_file(handle, path);
+ return handle->fns->sys_acl_delete_def_file_fn(handle, path);
}
int smb_vfs_call_sys_acl_get_perm(struct vfs_handle_struct *handle,
SMB_ACL_PERM_T perm)
{
VFS_FIND(sys_acl_get_perm);
- return handle->fns->sys_acl_get_perm(handle, permset, perm);
+ return handle->fns->sys_acl_get_perm_fn(handle, permset, perm);
}
int smb_vfs_call_sys_acl_free_text(struct vfs_handle_struct *handle,
char *text)
{
VFS_FIND(sys_acl_free_text);
- return handle->fns->sys_acl_free_text(handle, text);
+ return handle->fns->sys_acl_free_text_fn(handle, text);
}
int smb_vfs_call_sys_acl_free_acl(struct vfs_handle_struct *handle,
SMB_ACL_T posix_acl)
{
VFS_FIND(sys_acl_free_acl);
- return handle->fns->sys_acl_free_acl(handle, posix_acl);
+ return handle->fns->sys_acl_free_acl_fn(handle, posix_acl);
}
int smb_vfs_call_sys_acl_free_qualifier(struct vfs_handle_struct *handle,
void *qualifier, SMB_ACL_TAG_T tagtype)
{
VFS_FIND(sys_acl_free_qualifier);
- return handle->fns->sys_acl_free_qualifier(handle, qualifier, tagtype);
+ return handle->fns->sys_acl_free_qualifier_fn(handle, qualifier,
+ tagtype);
}
ssize_t smb_vfs_call_getxattr(struct vfs_handle_struct *handle,
size_t size)
{
VFS_FIND(getxattr);
- return handle->fns->getxattr(handle, path, name, value, size);
+ return handle->fns->getxattr_fn(handle, path, name, value, size);
}
ssize_t smb_vfs_call_lgetxattr(struct vfs_handle_struct *handle,
size_t size)
{
VFS_FIND(lgetxattr);
- return handle->fns->lgetxattr(handle, path, name, value, size);
+ return handle->fns->lgetxattr_fn(handle, path, name, value, size);
}
ssize_t smb_vfs_call_fgetxattr(struct vfs_handle_struct *handle,
void *value, size_t size)
{
VFS_FIND(fgetxattr);
- return handle->fns->fgetxattr(handle, fsp, name, value, size);
+ return handle->fns->fgetxattr_fn(handle, fsp, name, value, size);
}
ssize_t smb_vfs_call_listxattr(struct vfs_handle_struct *handle,
const char *path, char *list, size_t size)
{
VFS_FIND(listxattr);
- return handle->fns->listxattr(handle, path, list, size);
+ return handle->fns->listxattr_fn(handle, path, list, size);
}
ssize_t smb_vfs_call_llistxattr(struct vfs_handle_struct *handle,
const char *path, char *list, size_t size)
{
VFS_FIND(llistxattr);
- return handle->fns->llistxattr(handle, path, list, size);
+ return handle->fns->llistxattr_fn(handle, path, list, size);
}
ssize_t smb_vfs_call_flistxattr(struct vfs_handle_struct *handle,
size_t size)
{
VFS_FIND(flistxattr);
- return handle->fns->flistxattr(handle, fsp, list, size);
+ return handle->fns->flistxattr_fn(handle, fsp, list, size);
}
int smb_vfs_call_removexattr(struct vfs_handle_struct *handle,
const char *path, const char *name)
{
VFS_FIND(removexattr);
- return handle->fns->removexattr(handle, path, name);
+ return handle->fns->removexattr_fn(handle, path, name);
}
int smb_vfs_call_lremovexattr(struct vfs_handle_struct *handle,
const char *path, const char *name)
{
VFS_FIND(lremovexattr);
- return handle->fns->lremovexattr(handle, path, name);
+ return handle->fns->lremovexattr_fn(handle, path, name);
}
int smb_vfs_call_fremovexattr(struct vfs_handle_struct *handle,
struct files_struct *fsp, const char *name)
{
VFS_FIND(fremovexattr);
- return handle->fns->fremovexattr(handle, fsp, name);
+ return handle->fns->fremovexattr_fn(handle, fsp, name);
}
int smb_vfs_call_setxattr(struct vfs_handle_struct *handle, const char *path,
int flags)
{
VFS_FIND(setxattr);
- return handle->fns->setxattr(handle, path, name, value, size, flags);
+ return handle->fns->setxattr_fn(handle, path, name, value, size, flags);
}
int smb_vfs_call_lsetxattr(struct vfs_handle_struct *handle, const char *path,
int flags)
{
VFS_FIND(lsetxattr);
- return handle->fns->lsetxattr(handle, path, name, value, size, flags);
+ return handle->fns->lsetxattr_fn(handle, path, name, value, size,
+ flags);
}
int smb_vfs_call_fsetxattr(struct vfs_handle_struct *handle,
const void *value, size_t size, int flags)
{
VFS_FIND(fsetxattr);
- return handle->fns->fsetxattr(handle, fsp, name, value, size, flags);
+ return handle->fns->fsetxattr_fn(handle, fsp, name, value, size, flags);
}
int smb_vfs_call_aio_read(struct vfs_handle_struct *handle,
struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
{
VFS_FIND(aio_read);
- return handle->fns->aio_read(handle, fsp, aiocb);
+ return handle->fns->aio_read_fn(handle, fsp, aiocb);
}
int smb_vfs_call_aio_write(struct vfs_handle_struct *handle,
struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
{
VFS_FIND(aio_write);
- return handle->fns->aio_write(handle, fsp, aiocb);
+ return handle->fns->aio_write_fn(handle, fsp, aiocb);
}
-ssize_t smb_vfs_call_aio_return_fn(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- SMB_STRUCT_AIOCB *aiocb)
+ssize_t smb_vfs_call_aio_return(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ SMB_STRUCT_AIOCB *aiocb)
{
- VFS_FIND(aio_return_fn);
+ VFS_FIND(aio_return);
return handle->fns->aio_return_fn(handle, fsp, aiocb);
}
struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
{
VFS_FIND(aio_cancel);
- return handle->fns->aio_cancel(handle, fsp, aiocb);
+ return handle->fns->aio_cancel_fn(handle, fsp, aiocb);
}
-int smb_vfs_call_aio_error_fn(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- SMB_STRUCT_AIOCB *aiocb)
+int smb_vfs_call_aio_error(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ SMB_STRUCT_AIOCB *aiocb)
{
- VFS_FIND(aio_error_fn);
+ VFS_FIND(aio_error);
return handle->fns->aio_error_fn(handle, fsp, aiocb);
}
SMB_STRUCT_AIOCB *aiocb)
{
VFS_FIND(aio_fsync);
- return handle->fns->aio_fsync(handle, fsp, op, aiocb);
+ return handle->fns->aio_fsync_fn(handle, fsp, op, aiocb);
}
int smb_vfs_call_aio_suspend(struct vfs_handle_struct *handle,
const struct timespec *timeout)
{
VFS_FIND(aio_suspend);
- return handle->fns->aio_suspend(handle, fsp, aiocb, n, timeout);
+ return handle->fns->aio_suspend_fn(handle, fsp, aiocb, n, timeout);
}
bool smb_vfs_call_aio_force(struct vfs_handle_struct *handle,
struct files_struct *fsp)
{
VFS_FIND(aio_force);
- return handle->fns->aio_force(handle, fsp);
+ return handle->fns->aio_force_fn(handle, fsp);
}
bool smb_vfs_call_is_offline(struct vfs_handle_struct *handle,
SMB_STRUCT_STAT *sbuf)
{
VFS_FIND(is_offline);
- return handle->fns->is_offline(handle, fname, sbuf);
+ return handle->fns->is_offline_fn(handle, fname, sbuf);
}
int smb_vfs_call_set_offline(struct vfs_handle_struct *handle,
const struct smb_filename *fname)
{
VFS_FIND(set_offline);
- return handle->fns->set_offline(handle, fname);
+ return handle->fns->set_offline_fn(handle, fname);
}
git.samba.org / abartlet / samba.git / .git / blobdiff