The branch, master has been updated
via c62bb7dcb41 vfs_streams_depot: Introduce streams_depot_config_data
via 21ca7a4af3e vfs: Allow WITH_BACKUP_INTENT in vfs openat functions
from 7ef7f5e26e9 winbindd: move dead code into a comment
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c62bb7dcb418d6eeb467e4586de1ce8ed5a5d643
Author: Volker Lendecke <[email protected]>
Date: Wed Sep 30 14:36:40 2020 +0200
vfs_streams_depot: Introduce streams_depot_config_data
Read the vfs parameters just once: lp_parm_* are not free with their
string comparisons, calling them over and over again is unnecessary
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Feb 13 09:40:22 UTC 2025 on atb-devel-224
commit 21ca7a4af3e06e219a72b08ffe7916df6b7432c8
Author: Volker Lendecke <[email protected]>
Date: Thu Jan 23 13:42:48 2025 +0100
vfs: Allow WITH_BACKUP_INTENT in vfs openat functions
BACKUP_INTENT has no real meaning so far throughout our code, so we
should ignore and thus allow it in our openat-intercepting functions.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aio_pthread.c | 2 +-
source3/modules/vfs_ceph.c | 2 +-
source3/modules/vfs_ceph_new.c | 2 +-
source3/modules/vfs_fruit.c | 2 +-
source3/modules/vfs_glusterfs.c | 2 +-
source3/modules/vfs_streams_depot.c | 92 +++++++++++++++++++++++++++----------
source3/modules/vfs_streams_xattr.c | 2 +-
7 files changed, 74 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aio_pthread.c
b/source3/modules/vfs_aio_pthread.c
index b099a6b5b52..bd0c94b8cce 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -457,7 +457,7 @@ static int aio_pthread_openat_fn(vfs_handle_struct *handle,
bool aio_allow_open = lp_parm_bool(
SNUM(handle->conn), "aio_pthread", "aio open", false);
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
errno = ENOSYS;
return -1;
}
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 49cbd17692f..3913cb01b2c 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -472,7 +472,7 @@ static int cephwrap_openat(struct vfs_handle_struct *handle,
int result = -ENOENT;
int dirfd = -1;
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
errno = ENOSYS;
return -1;
}
diff --git a/source3/modules/vfs_ceph_new.c b/source3/modules/vfs_ceph_new.c
index bdde986c5f6..52962c19a60 100644
--- a/source3/modules/vfs_ceph_new.c
+++ b/source3/modules/vfs_ceph_new.c
@@ -2131,7 +2131,7 @@ static int vfs_ceph_openat(struct vfs_handle_struct
*handle,
int result = -ENOENT;
START_PROFILE(syscall_openat);
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
result = -ENOSYS;
goto err_out;
}
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 09d171bef8a..70829def8d6 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1742,7 +1742,7 @@ static int fruit_openat(vfs_handle_struct *handle,
how);
}
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
errno = ENOSYS;
return -1;
}
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 48a76189096..63dc7a30b04 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -731,7 +731,7 @@ static int vfs_gluster_openat(struct vfs_handle_struct
*handle,
START_PROFILE(syscall_openat);
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
END_PROFILE(syscall_openat);
errno = ENOSYS;
return -1;
diff --git a/source3/modules/vfs_streams_depot.c
b/source3/modules/vfs_streams_depot.c
index dd4f8f524f8..322e04268b8 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -25,6 +25,12 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
+struct streams_depot_config_data {
+ const char *directory;
+ bool check_valid;
+ bool delete_lost;
+};
+
/*
* Excerpt from a mail from tridge:
*
@@ -152,6 +158,7 @@ static char *stream_dir(vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
const SMB_STRUCT_STAT *base_sbuf, bool create_it)
{
+ struct streams_depot_config_data *config = NULL;
uint32_t hash;
struct smb_filename *smb_fname_hash = NULL;
char *result = NULL;
@@ -161,14 +168,16 @@ static char *stream_dir(vfs_handle_struct *handle,
struct file_id id;
uint8_t id_buf[16];
char id_hex[sizeof(id_buf) * 2 + 1];
- char *rootdir = NULL;
+ const char *rootdir = NULL;
struct smb_filename *rootdir_fname = NULL;
struct smb_filename *tmp_fname = NULL;
struct vfs_rename_how rhow = { .flags = 0, };
int ret;
- rootdir = stream_rootdir(handle,
- talloc_tos());
+ SMB_VFS_HANDLE_GET_DATA(
+ handle, config, struct streams_depot_config_data, return NULL);
+
+ rootdir = config->directory;
if (rootdir == NULL) {
errno = ENOMEM;
goto fail;
@@ -243,19 +252,13 @@ static char *stream_dir(vfs_handle_struct *handle,
if (SMB_VFS_NEXT_STAT(handle, smb_fname_hash) == 0) {
struct smb_filename *smb_fname_new = NULL;
char *newname;
- bool check_valid, delete_lost;
if (!S_ISDIR(smb_fname_hash->st.st_ex_mode)) {
errno = EINVAL;
goto fail;
}
- check_valid = lp_parm_bool(SNUM(handle->conn),
- "streams_depot",
- "check_valid",
- true);
-
- if (!check_valid ||
+ if (!config->check_valid ||
file_is_valid(handle, smb_fname)) {
return result;
}
@@ -267,10 +270,7 @@ static char *stream_dir(vfs_handle_struct *handle,
*/
again:
- delete_lost = lp_parm_bool(SNUM(handle->conn), "streams_depot",
- "delete_lost", false);
-
- if (delete_lost) {
+ if (config->delete_lost) {
DBG_NOTICE("Someone has recreated a file under an "
"existing inode. Removing: %s\n",
smb_fname_hash->base_name);
@@ -403,14 +403,12 @@ static char *stream_dir(vfs_handle_struct *handle,
}
TALLOC_FREE(rootdir_fname);
- TALLOC_FREE(rootdir);
TALLOC_FREE(tmp_fname);
TALLOC_FREE(smb_fname_hash);
return result;
fail:
TALLOC_FREE(rootdir_fname);
- TALLOC_FREE(rootdir);
TALLOC_FREE(tmp_fname);
TALLOC_FREE(smb_fname_hash);
TALLOC_FREE(result);
@@ -499,6 +497,7 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle,
void *private_data),
void *private_data)
{
+ struct streams_depot_config_data *config = NULL;
char *dirname;
char *rootdir = NULL;
char *orig_connectpath = NULL;
@@ -508,6 +507,9 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle,
char *talloced = NULL;
NTSTATUS status;
+ SMB_VFS_HANDLE_GET_DATA(
+ handle, config, struct streams_depot_config_data, return
NT_STATUS_NO_MEMORY);
+
dirname = stream_dir(handle, smb_fname_base, &smb_fname_base->st,
false);
@@ -540,7 +542,7 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle,
* path for this share. We're dealing with absolute paths
* here so we don't care about chdir calls.
*/
- rootdir = stream_rootdir(handle, talloc_tos());
+ rootdir = talloc_strdup(talloc_tos(), config->directory);
if (rootdir == NULL) {
TALLOC_FREE(dir_smb_fname);
TALLOC_FREE(dirname);
@@ -733,12 +735,16 @@ static int streams_depot_openat(struct vfs_handle_struct
*handle,
struct files_struct *fsp,
const struct vfs_open_how *how)
{
+ struct streams_depot_config_data *config = NULL;
struct smb_filename *smb_fname_stream = NULL;
struct files_struct *fspcwd = NULL;
NTSTATUS status;
bool create_it;
int ret = -1;
+ SMB_VFS_HANDLE_GET_DATA(
+ handle, config, struct streams_depot_config_data, return -1);
+
if (!is_named_stream(smb_fname)) {
return SMB_VFS_NEXT_OPENAT(handle,
dirfsp,
@@ -747,7 +753,7 @@ static int streams_depot_openat(struct vfs_handle_struct
*handle,
how);
}
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
errno = ENOSYS;
return -1;
}
@@ -772,13 +778,8 @@ static int streams_depot_openat(struct vfs_handle_struct
*handle,
}
if (create_it) {
- bool check_valid = lp_parm_bool(
- SNUM(handle->conn),
- "streams_depot",
- "check_valid",
- true);
- if (check_valid) {
+ if (config->check_valid) {
char buf = '1';
DBG_DEBUG("marking file %s as valid\n",
@@ -1275,7 +1276,50 @@ static uint32_t streams_depot_fs_capabilities(struct
vfs_handle_struct *handle,
return SMB_VFS_NEXT_FS_CAPABILITIES(handle, p_ts_res) |
FILE_NAMED_STREAMS;
}
+static int streams_depot_connect(
+ struct vfs_handle_struct *handle,
+ const char *service,
+ const char *user)
+{
+ struct connection_struct *conn = handle->conn;
+ struct streams_depot_config_data *config = NULL;
+ int ret;
+
+ config = talloc_zero(conn, struct streams_depot_config_data);
+ if (config == NULL) {
+ goto nomem;
+ }
+
+ ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+ if (ret < 0) {
+ TALLOC_FREE(config);
+ return ret;
+ }
+
+ config->check_valid = lp_parm_bool(
+ SNUM(conn), "streams_depot", "check_valid", true);
+
+ config->directory = stream_rootdir(handle, config);
+
+ config->delete_lost = lp_parm_bool(
+ SNUM(conn), "streams_depot", "delete_lost", false);
+
+ SMB_VFS_HANDLE_SET_DATA(
+ handle,
+ config,
+ NULL,
+ struct streams_depot_config_data,
+ return -1);
+
+ return 0;
+nomem:
+ TALLOC_FREE(config);
+ errno = ENOMEM;
+ return -1;
+}
+
static struct vfs_fn_pointers vfs_streams_depot_fns = {
+ .connect_fn = streams_depot_connect,
.fs_capabilities_fn = streams_depot_fs_capabilities,
.openat_fn = streams_depot_openat,
.stat_fn = streams_depot_stat,
diff --git a/source3/modules/vfs_streams_xattr.c
b/source3/modules/vfs_streams_xattr.c
index 7601e744198..ac01cc46043 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -416,7 +416,7 @@ static int streams_xattr_openat(struct vfs_handle_struct
*handle,
how);
}
- if (how->resolve != 0) {
+ if ((how->resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
errno = ENOSYS;
return -1;
}
--
Samba Shared Repository
