sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-05 04:59:08 +03:00
Code Activity

s3:streams_depot: add an option to disable the xattr checks

Browse Source 
streams_depot:check_valid=no is useful when the filesystem
has no xattr support and files are only published via samba.

metze
This commit is contained in:
Stefan Metzmacher
2008-12-01 14:20:21 -08:00
committed by Jeremy Allison
parent d53f82a1cf
commit b0c0b949fe
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source3/modules/vfs_streams_depot.c
View File

@ -67,10 +67,15 @@ static uint32_t hash_fn(DATA_BLOB key)
#define SAMBA_XATTR_MARKER "user.SAMBA_STREAMS" #define SAMBA_XATTR_MARKER "user.SAMBA_STREAMS"
static bool file_is_valid(vfs_handle_struct *handle, const char *path) static bool file_is_valid(vfs_handle_struct *handle, const char *path,
bool check_valid)
{ {
char buf; char buf;
if (!check_valid) {
return true;
}
DEBUG(10, ("file_is_valid (%s) called\n", path)); DEBUG(10, ("file_is_valid (%s) called\n", path));
if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER, if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
@ -87,11 +92,16 @@ static bool file_is_valid(vfs_handle_struct *handle, const char *path)
return true; return true;
} }
static bool mark_file_valid(vfs_handle_struct *handle, const char *path) static bool mark_file_valid(vfs_handle_struct *handle, const char *path,
bool check_valid)
{ {
char buf = '1'; char buf = '1';
int ret; int ret;
if (!check_valid) {
return true;
}
DEBUG(10, ("marking file %s as valid\n", path)); DEBUG(10, ("marking file %s as valid\n", path));
ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER, ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
@ -116,8 +126,12 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
char *id_hex; char *id_hex;
struct file_id id; struct file_id id;
uint8 id_buf[16]; uint8 id_buf[16];
bool check_valid;
const char *rootdir; const char *rootdir;
check_valid = lp_parm_bool(SNUM(handle->conn),
"streams_depot", "check_valid", true);
tmp = talloc_asprintf(talloc_tos(), "%s/.streams", handle->conn->connectpath); tmp = talloc_asprintf(talloc_tos(), "%s/.streams", handle->conn->connectpath);
if (tmp == NULL) { if (tmp == NULL) {
@ -174,7 +188,7 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
goto fail; goto fail;
} }
if (file_is_valid(handle, base_path)) { if (file_is_valid(handle, base_path, check_valid)) {
return result; return result;
} }
@ -244,7 +258,7 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
goto fail; goto fail;
} }
if (!mark_file_valid(handle, base_path)) { if (!mark_file_valid(handle, base_path, check_valid)) {
goto fail; goto fail;
} }