From ad88284038104f57e383418e1a0a5abc938b18f6 Mon Sep 17 00:00:00 2001 From: Aravind Srinivasan Date: Wed, 26 Aug 2009 14:55:38 -0700 Subject: s3: Major revamp for catia vfs module This patch builds out catia to allow fully configurable mappings, including mappings from single byte to multi-byte characters. Additionally, a much more complete list of vfs operations are now covered. Signed-off-by: Tim Prouty --- source3/modules/vfs_catia.c | 982 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 837 insertions(+), 145 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 112c7457bb..3c1ab81dc0 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -9,6 +9,7 @@ * under Windows... * * Copyright (C) Volker Lendecke, 2005 + * Copyright (C) Aravind Srinivasan, 2009 * * 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 @@ -27,110 +28,290 @@ #include "includes.h" -static char *catia_string_replace(TALLOC_CTX *ctx, - const char *s, - unsigned char oldc, - unsigned char newc) +#define TO_UNIX 0 +#define TO_WINDOWS 1 + +#define GLOBAL_SNUM 0xFFFFFFF +#define MAP_SIZE 0xFF +#define MAP_NUM 0x101 /* max unicode charval / MAP_SIZE */ +#define T_OFFSET(_v_) ((_v_ % MAP_SIZE)) +#define T_START(_v_) (((_v_ / MAP_SIZE) * MAP_SIZE)) +#define T_PICK(_v_) ((_v_ / MAP_SIZE)) + +struct char_mappings { + smb_ucs2_t entry[MAP_SIZE][2]; +}; + +struct share_mapping_entry { + int snum; + struct share_mapping_entry *next; + struct char_mappings **mappings; +}; + +struct share_mapping_entry *srt_head = NULL; + +static bool build_table(struct char_mappings **cmaps, int value) { - smb_ucs2_t *tmpbuf = NULL; - smb_ucs2_t *ptr = NULL; - smb_ucs2_t old = oldc; - char *ret = NULL; - size_t converted_size; + int i; + int start = T_START(value); - if (!s) { - return NULL; + (*cmaps) = (struct char_mappings *) + TALLOC_ZERO(NULL, sizeof(struct char_mappings)); + + if (!*cmaps) + return False; + + for (i = 0; i <= MAP_SIZE;i++) { + (*cmaps)->entry[i][TO_UNIX] = start + i; + (*cmaps)->entry[i][TO_WINDOWS] = start + i; } - if (!push_ucs2_talloc(ctx, &tmpbuf, s, &converted_size)) { - return NULL; + return True; +} + +static void set_tables(struct char_mappings **cmaps, + long unix_map, + long windows_map) +{ + int i; + + /* set unix -> windows */ + i = T_OFFSET(unix_map); + cmaps[T_PICK(unix_map)]->entry[i][TO_WINDOWS] = windows_map; + + /* set windows -> unix */ + i = T_OFFSET(windows_map); + cmaps[T_PICK(windows_map)]->entry[i][TO_UNIX] = unix_map; +} + +static bool build_ranges(struct char_mappings **cmaps, + long unix_map, + long windows_map) +{ + + if (!cmaps[T_PICK(unix_map)]) { + if (!build_table(&cmaps[T_PICK(unix_map)], unix_map)) + return False; } - ptr = tmpbuf; + if (!cmaps[T_PICK(windows_map)]) { + if (!build_table(&cmaps[T_PICK(windows_map)], windows_map)) + return False; + } - for (;*ptr;ptr++) { - if (*ptr==old) { - *ptr=newc; - } + set_tables(cmaps, unix_map, windows_map); + + return True; +} + +struct share_mapping_entry *get_srt(connection_struct *conn, + struct share_mapping_entry **global) +{ + struct share_mapping_entry *share; + + for (share = srt_head; share != NULL; share = share->next) { + if (share->snum == GLOBAL_SNUM) + (*global) = share; + + if (share->snum == SNUM(conn)) + return share; } - if (!pull_ucs2_talloc(ctx, &ret, tmpbuf, &converted_size)) { - TALLOC_FREE(tmpbuf); - return NULL; + return share; +} + +struct share_mapping_entry *add_srt(int snum, const char **mappings) +{ + + char *tmp; + fstring mapping; + int i; + long unix_map, windows_map; + struct share_mapping_entry *ret = NULL; + + ret = (struct share_mapping_entry *) + TALLOC_ZERO(NULL, sizeof(struct share_mapping_entry) + + (mappings ? (MAP_NUM * sizeof(struct char_mappings *)) : 0)); + + if (!ret) + return ret; + + ret->snum = snum; + + if (mappings) { + ret->mappings = (struct char_mappings**) ((unsigned char*) ret + + sizeof(struct share_mapping_entry)); + memset(ret->mappings, 0, + MAP_NUM * sizeof(struct char_mappings *)); + } else { + ret->mappings = NULL; + return ret; } - TALLOC_FREE(tmpbuf); + + /* + * catia mappings are of the form : + * UNIX char (in 0xnn hex) : WINDOWS char (in 0xnn hex) + * + * multiple mappings are comma seperated in smb.conf + */ + for (i=0;mappings[i];i++) { + fstrcpy(mapping, mappings[i]); + unix_map = strtol(mapping, &tmp, 16); + if (unix_map == 0 && errno == EINVAL) { + DEBUG(0, ("INVALID CATIA MAPPINGS - %s\n", mapping)); + continue; + } + windows_map = strtol(++tmp, NULL, 16); + if (windows_map == 0 && errno == EINVAL) { + DEBUG(0, ("INVALID CATIA MAPPINGS - %s\n", mapping)); + continue; + } + + if (!build_ranges(ret->mappings, unix_map, windows_map)) { + DEBUG(0, ("TABLE ERROR - CATIA MAPPINGS - %s\n", mapping)); + continue; + } + } + + ret->next = srt_head; + srt_head = ret; + return ret; } -static char *from_unix(TALLOC_CTX *ctx, const char *s) +static bool init_mappings(connection_struct *conn, + struct share_mapping_entry **selected_out) { - char *ret = catia_string_replace(ctx, s, '\x22', '\xa8'); - ret = catia_string_replace(ctx, ret, '\x2a', '\xa4'); - ret = catia_string_replace(ctx, ret, '\x2f', '\xf8'); - ret = catia_string_replace(ctx, ret, '\x3a', '\xf7'); - ret = catia_string_replace(ctx, ret, '\x3c', '\xab'); - ret = catia_string_replace(ctx, ret, '\x3e', '\xbb'); - ret = catia_string_replace(ctx, ret, '\x3f', '\xbf'); - ret = catia_string_replace(ctx, ret, '\x5c', '\xff'); - ret = catia_string_replace(ctx, ret, '\x7c', '\xa6'); - return catia_string_replace(ctx, ret, ' ', '\xb1'); + const char **mappings = NULL; + struct share_mapping_entry *share_level = NULL; + struct share_mapping_entry *global = NULL; + + /* check srt cache */ + share_level = get_srt(conn, &global); + if (share_level) { + *selected_out = share_level; + return (share_level->mappings != NULL); + } + + /* see if we have a global setting */ + if (!global) { + /* global setting */ + mappings = lp_parm_string_list(-1, "catia", "mappings", NULL); + global = add_srt(GLOBAL_SNUM, mappings); + } + + /* no global setting - what about share level ? */ + mappings = lp_parm_string_list(SNUM(conn), "catia", "mappings", NULL); + share_level = add_srt(SNUM(conn), mappings); + + if (share_level->mappings) { + (*selected_out) = share_level; + return True; + } else if (global->mappings) { + share_level->mappings = global->mappings; + (*selected_out) = share_level; + return True; + } + + return False; } -static char *to_unix(TALLOC_CTX *ctx, const char *s) +static NTSTATUS catia_string_replace_allocate(connection_struct *conn, + const char *name_in, + char **mapped_name, + int direction) { - char *ret = catia_string_replace(ctx, s, '\xa8', '\x22'); - ret = catia_string_replace(ctx, ret, '\xa4', '\x2a'); - ret = catia_string_replace(ctx, ret, '\xf8', '\x2f'); - ret = catia_string_replace(ctx, ret, '\xf7', '\x3a'); - ret = catia_string_replace(ctx, ret, '\xab', '\x3c'); - ret = catia_string_replace(ctx, ret, '\xbb', '\x3e'); - ret = catia_string_replace(ctx, ret, '\xbf', '\x3f'); - ret = catia_string_replace(ctx, ret, '\xff', '\x5c'); - ret = catia_string_replace(ctx, ret, '\xa6', '\x7c'); - return catia_string_replace(ctx, ret, '\xb1', ' '); + static smb_ucs2_t *tmpbuf = NULL; + smb_ucs2_t *ptr; + struct share_mapping_entry *selected; + struct char_mappings *map = NULL; + size_t converted_size; + TALLOC_CTX *ctx = talloc_tos(); + + if (!init_mappings(conn, &selected)) + return NT_STATUS_OK; + + if ((push_ucs2_talloc(ctx, &tmpbuf, name_in, + &converted_size)) == -1) { + return map_nt_error_from_unix(errno); + } + ptr = tmpbuf; + for(;*ptr;ptr++) { + if (*ptr == 0) + break; + map = selected->mappings[T_PICK((*ptr))]; + + /* nothing to do */ + if (!map) + continue; + + *ptr = map->entry[T_OFFSET((*ptr))][direction]; + } + + if ((pull_ucs2_talloc(ctx, mapped_name, tmpbuf, + &converted_size)) == -1) { + TALLOC_FREE(tmpbuf); + return map_nt_error_from_unix(errno); + } + TALLOC_FREE(tmpbuf); + return NT_STATUS_OK; } static SMB_STRUCT_DIR *catia_opendir(vfs_handle_struct *handle, - const char *fname, const char *mask, uint32 attr) + const char *fname, + const char *mask, + uint32 attr) { - char *name = to_unix(talloc_tos(), fname); + char *name_mapped = NULL; + NTSTATUS status; + SMB_STRUCT_DIR *ret; - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, fname, + &name_mapped, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return NULL; } - return SMB_VFS_NEXT_OPENDIR(handle, name, mask, attr); + + ret = SMB_VFS_NEXT_OPENDIR(handle, name_mapped, mask, attr); + TALLOC_FREE(name_mapped); + + return ret; } -static SMB_STRUCT_DIRENT *catia_readdir(vfs_handle_struct *handle, - SMB_STRUCT_DIR *dirp, - SMB_STRUCT_STAT *sbuf) +/* + * TRANSLATE_NAME call which converts the given name to + * "WINDOWS displayable" name + */ +static NTSTATUS catia_translate_name(vfs_handle_struct *handle, + char **mapped_name) { - SMB_STRUCT_DIRENT *result = NULL; - SMB_STRUCT_DIRENT *newdirent = NULL; - char *newname; - size_t newnamelen; + char *name = NULL; + NTSTATUS ret; - result = SMB_VFS_NEXT_READDIR(handle, dirp, NULL); - if (result == NULL) { - return result; + /* + * Copy the supplied name and free the memory for mapped_name, + * already allocated by the caller. + * We will be allocating new memory for mapped_name in + * catia_string_replace_allocate + */ + name = talloc_strdup(talloc_tos(), *mapped_name); + if (!name) { + errno = ENOMEM; + return NT_STATUS_NO_MEMORY; } + TALLOC_FREE(*mapped_name); + ret = catia_string_replace_allocate(handle->conn, name, + mapped_name, TO_WINDOWS); - newname = from_unix(talloc_tos(), result->d_name); - if (!newname) { - return NULL; - } - newnamelen = strlen(newname)+1; - newdirent = (SMB_STRUCT_DIRENT *)TALLOC_ARRAY(talloc_tos(), - char, - sizeof(SMB_STRUCT_DIRENT)+ - newnamelen); - if (!newdirent) { - return NULL; + TALLOC_FREE(name); + if (!NT_STATUS_IS_OK(ret)) { + return ret; } - memcpy(newdirent, result, sizeof(SMB_STRUCT_DIRENT)); - memcpy(&newdirent->d_name, newname, newnamelen); - return newdirent; + + ret = SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name); + + return ret; } static int catia_open(vfs_handle_struct *handle, @@ -139,23 +320,69 @@ static int catia_open(vfs_handle_struct *handle, int flags, mode_t mode) { - char *name; + char *name_mapped = NULL; char *tmp_base_name; int ret; + NTSTATUS status; - name = to_unix(talloc_tos(), smb_fname->base_name); - if (!name) { - errno = ENOMEM; + tmp_base_name = smb_fname->base_name; + status = catia_string_replace_allocate(handle->conn, + smb_fname->base_name, + &name_mapped, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } - tmp_base_name = smb_fname->base_name; - smb_fname->base_name = name; - + smb_fname->base_name = name_mapped; ret = SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode); + smb_fname->base_name = tmp_base_name; + TALLOC_FREE(name_mapped); + + return ret; +} + +/* @internal - Isilon create file support */ +static NTSTATUS catia_createfile(vfs_handle_struct *handle, + struct smb_request *req, + uint16_t root_dir_fid, + struct smb_filename *smb_fname, + uint32_t access_mask, + uint32_t share_access, + uint32_t create_disposition, + uint32_t create_options, + uint32_t file_attributes, + uint32_t oplock_request, + uint64_t allocation_size, + struct security_descriptor *sd, + struct ea_list *ea_list, + files_struct **result, + int *pinfo) +{ + char *name_mapped = NULL; + char *tmp_base_name; + NTSTATUS ret; + + ret = catia_string_replace_allocate(handle->conn, smb_fname->base_name, + &name_mapped, TO_UNIX); + if (!NT_STATUS_IS_OK(ret)) { + errno = map_errno_from_nt_status(ret); + return ret; + } + + tmp_base_name = smb_fname->base_name; + DEBUG(5, ("catia_createfile converted %s->%s (orginally %s)\n", + tmp_base_name, name_mapped, tmp_base_name)); + smb_fname->base_name = name_mapped; + ret = SMB_VFS_NEXT_CREATE_FILE(handle, req, root_dir_fid, + smb_fname, access_mask, share_access, + create_disposition, create_options, + file_attributes, oplock_request, + allocation_size, sd, ea_list, + result, pinfo); smb_fname->base_name = tmp_base_name; - TALLOC_FREE(name); + TALLOC_FREE(name_mapped); return ret; } @@ -165,47 +392,49 @@ static int catia_rename(vfs_handle_struct *handle, const struct smb_filename *smb_fname_dst) { TALLOC_CTX *ctx = talloc_tos(); - char *oname = NULL; - char *nname = NULL; struct smb_filename *smb_fname_src_tmp = NULL; struct smb_filename *smb_fname_dst_tmp = NULL; NTSTATUS status; int ret = -1; - oname = to_unix(ctx, smb_fname_src->base_name); - nname = to_unix(ctx, smb_fname_dst->base_name); - if (!oname || !nname) { - errno = ENOMEM; - goto out; + status = catia_string_replace_allocate(handle->conn, + smb_fname_src->base_name, + &(smb_fname_src_tmp->base_name), TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + status = catia_string_replace_allocate(handle->conn, + smb_fname_dst->base_name, + &(smb_fname_dst_tmp->base_name), TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; } /* Setup temporary smb_filename structs. */ - status = copy_smb_filename(talloc_tos(), smb_fname_src, - &smb_fname_src_tmp); + status = copy_smb_filename(ctx, smb_fname_src, &smb_fname_src_tmp); + if (!NT_STATUS_IS_OK(status)) { errno = map_errno_from_nt_status(status); goto out; } - status = copy_smb_filename(talloc_tos(), smb_fname_dst, - &smb_fname_dst_tmp); + + status = copy_smb_filename(ctx, smb_fname_dst, &smb_fname_dst_tmp); if (!NT_STATUS_IS_OK(status)) { errno = map_errno_from_nt_status(status); goto out; } - smb_fname_src_tmp->base_name = oname; - smb_fname_dst_tmp->base_name = nname; - DEBUG(10, ("converted old name: %s\n", - smb_fname_str_dbg(smb_fname_src_tmp))); + smb_fname_str_dbg(smb_fname_src_tmp))); DEBUG(10, ("converted new name: %s\n", - smb_fname_str_dbg(smb_fname_dst_tmp))); + smb_fname_str_dbg(smb_fname_dst_tmp))); - ret = SMB_VFS_NEXT_RENAME(handle, smb_fname_src_tmp, - smb_fname_dst_tmp); - out: - TALLOC_FREE(oname); - TALLOC_FREE(nname); + ret = SMB_VFS_NEXT_RENAME(handle, smb_fname_src_tmp, + smb_fname_dst_tmp); +out: TALLOC_FREE(smb_fname_src_tmp); TALLOC_FREE(smb_fname_dst_tmp); return ret; @@ -214,13 +443,16 @@ static int catia_rename(vfs_handle_struct *handle, static int catia_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname) { - char *name; + char *name = NULL; char *tmp_base_name; int ret; + NTSTATUS status; - name = to_unix(talloc_tos(), smb_fname->base_name); - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, + smb_fname->base_name, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } @@ -228,23 +460,25 @@ static int catia_stat(vfs_handle_struct *handle, smb_fname->base_name = name; ret = SMB_VFS_NEXT_STAT(handle, smb_fname); - smb_fname->base_name = tmp_base_name; - TALLOC_FREE(name); + TALLOC_FREE(name); return ret; } static int catia_lstat(vfs_handle_struct *handle, struct smb_filename *smb_fname) { - char *name; + char *name = NULL; char *tmp_base_name; int ret; + NTSTATUS status; - name = to_unix(talloc_tos(), smb_fname->base_name); - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, + smb_fname->base_name, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } @@ -252,7 +486,6 @@ static int catia_lstat(vfs_handle_struct *handle, smb_fname->base_name = name; ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname); - smb_fname->base_name = tmp_base_name; TALLOC_FREE(name); @@ -267,91 +500,550 @@ static int catia_unlink(vfs_handle_struct *handle, NTSTATUS status; int ret; - name = to_unix(talloc_tos(), smb_fname->base_name); - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, + smb_fname->base_name, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } /* Setup temporary smb_filename structs. */ - status = copy_smb_filename(talloc_tos(), smb_fname, - &smb_fname_tmp); + status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp); if (!NT_STATUS_IS_OK(status)) { errno = map_errno_from_nt_status(status); return -1; } smb_fname_tmp->base_name = name; + ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp); + TALLOC_FREE(smb_fname_tmp); + TALLOC_FREE(name); - ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp); + return ret; +} + +static int catia_chown(vfs_handle_struct *handle, + const char *path, + uid_t uid, + gid_t gid) +{ + char *name = NULL; + NTSTATUS status; + int ret; + + status = catia_string_replace_allocate(handle->conn, path, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + ret = SMB_VFS_NEXT_CHOWN(handle, name, uid, gid); + TALLOC_FREE(name); - TALLOC_FREE(smb_fname_tmp); return ret; } -static int catia_chmod(vfs_handle_struct *handle, - const char *path, mode_t mode) +static int catia_lchown(vfs_handle_struct *handle, + const char *path, + uid_t uid, + gid_t gid) { - char *name = to_unix(talloc_tos(), path); + char *name = NULL; + NTSTATUS status; + int ret; - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, path, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } - return SMB_VFS_NEXT_CHMOD(handle, name, mode); + + ret = SMB_VFS_NEXT_LCHOWN(handle, name, uid, gid); + TALLOC_FREE(name); + + return ret; } -static int catia_chown(vfs_handle_struct *handle, - const char *path, uid_t uid, gid_t gid) +static int catia_rmdir(vfs_handle_struct *handle, + const char *path) { - char *name = to_unix(talloc_tos(), path); + char *name = NULL; + NTSTATUS status; + int ret; - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, path, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } - return SMB_VFS_NEXT_CHOWN(handle, name, uid, gid); + + ret = SMB_VFS_NEXT_RMDIR(handle, name); + TALLOC_FREE(name); + + return ret; } -static int catia_lchown(vfs_handle_struct *handle, - const char *path, uid_t uid, gid_t gid) +static int catia_mkdir(vfs_handle_struct *handle, + const char *path, + mode_t mode) { - char *name = to_unix(talloc_tos(), path); + char *name = NULL; + NTSTATUS status; + int ret; - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, path, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } - return SMB_VFS_NEXT_LCHOWN(handle, name, uid, gid); + + ret = SMB_VFS_NEXT_MKDIR(handle, name, mode); + TALLOC_FREE(name); + + return ret; } static int catia_chdir(vfs_handle_struct *handle, const char *path) { - char *name = to_unix(talloc_tos(), path); + char *name = NULL; + NTSTATUS status; + int ret; - if (!name) { - errno = ENOMEM; + status = catia_string_replace_allocate(handle->conn, path, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + ret = SMB_VFS_NEXT_CHDIR(handle, name); + TALLOC_FREE(name); + + return ret; +} + +static int catia_ntimes(vfs_handle_struct *handle, + const struct smb_filename *smb_fname, + struct smb_file_time *ft) +{ + struct smb_filename *smb_fname_tmp = NULL; + char *name = NULL; + NTSTATUS status; + int ret; + + status = catia_string_replace_allocate(handle->conn, + smb_fname->base_name, + &name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + smb_fname_tmp->base_name = name; + ret = SMB_VFS_NEXT_NTIMES(handle, smb_fname_tmp, ft); + TALLOC_FREE(smb_fname_tmp); + + return ret; +} + +static char * +catia_realpath(vfs_handle_struct *handle, const char *path, + char *resolved_path) +{ + char *mapped_name = NULL; + NTSTATUS status; + char *ret = NULL; + + status = catia_string_replace_allocate(handle->conn, path, + &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return NULL; + } + + ret = SMB_VFS_NEXT_REALPATH(handle, mapped_name, resolved_path); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int catia_chflags(struct vfs_handle_struct *handle, + const char *path, unsigned int flags) +{ + char *mapped_name = NULL; + NTSTATUS status; + int ret; + + status = catia_string_replace_allocate(handle->conn, path, + &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + ret = SMB_VFS_NEXT_CHFLAGS(handle, mapped_name, flags); + TALLOC_FREE(mapped_name); + + return ret; +} + +static NTSTATUS +catia_streaminfo(struct vfs_handle_struct *handle, + struct files_struct *fsp, + const char *path, + TALLOC_CTX *mem_ctx, + unsigned int *num_streams, + struct stream_struct **streams) +{ + char *mapped_name = NULL; + NTSTATUS status; + + status = catia_string_replace_allocate(handle->conn, path, + &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return status; + } + + status = SMB_VFS_NEXT_STREAMINFO(handle, fsp, mapped_name, + mem_ctx, num_streams,streams); + TALLOC_FREE(mapped_name); + + return status; +} + +static NTSTATUS +catia_get_nt_acl(struct vfs_handle_struct *handle, + const char *path, + uint32 security_info, + struct security_descriptor **ppdesc) +{ + char *mapped_name = NULL; + NTSTATUS status; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return status; + } + status = SMB_VFS_NEXT_GET_NT_ACL(handle, mapped_name, + security_info, ppdesc); + TALLOC_FREE(mapped_name); + + return status; +} + +static int +catia_chmod_acl(vfs_handle_struct *handle, + const char *path, + mode_t mode) +{ + char *mapped_name = NULL; + NTSTATUS status; + int ret; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + ret = SMB_VFS_NEXT_CHMOD_ACL(handle, mapped_name, mode); + TALLOC_FREE(mapped_name); + return ret; +} + +static SMB_ACL_T +catia_sys_acl_get_file(vfs_handle_struct *handle, + const char *path, + SMB_ACL_TYPE_T type) +{ + char *mapped_name = NULL; + NTSTATUS status; + SMB_ACL_T ret; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return NULL; + } + + ret = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, mapped_name, type); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int +catia_sys_acl_set_file(vfs_handle_struct *handle, + const char *path, + SMB_ACL_TYPE_T type, + SMB_ACL_T theacl) +{ + char *mapped_name = NULL; + NTSTATUS status; + int ret; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + ret = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, mapped_name, type, theacl); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int +catia_sys_acl_delete_def_file(vfs_handle_struct *handle, + const char *path) +{ + char *mapped_name = NULL; + NTSTATUS status; + int ret; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + ret = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, mapped_name); + TALLOC_FREE(mapped_name); + + return ret; +} + +static ssize_t +catia_getxattr(vfs_handle_struct *handle, const char *path, + const char *name, void *value, size_t size) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + name, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_GETXATTR(handle, path, mapped_name, value, size); + TALLOC_FREE(mapped_name); + + return ret; +} + +static ssize_t +catia_lgetxattr(vfs_handle_struct *handle, const char *path, + const char *name, void *value, size_t size) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + name, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_LGETXATTR(handle, path, mapped_name, value, size); + TALLOC_FREE(mapped_name); + + return ret; +} + +static ssize_t +catia_listxattr(vfs_handle_struct *handle, const char *path, + char *list, size_t size) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_LISTXATTR(handle, mapped_name, list, size); + TALLOC_FREE(mapped_name); + + return ret; +} + +static ssize_t +catia_llistxattr(vfs_handle_struct *handle, const char *path, + char *list, size_t size) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + path, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_LLISTXATTR(handle, mapped_name, list, size); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int +catia_removexattr(vfs_handle_struct *handle, const char *path, + const char *name) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + name, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_REMOVEXATTR(handle, path, mapped_name); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int +catia_lremovexattr(vfs_handle_struct *handle, const char *path, + const char *name) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + name, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, mapped_name); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int +catia_setxattr(vfs_handle_struct *handle, const char *path, + const char *name, const void *value, size_t size, + int flags) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + name, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); return -1; } - return SMB_VFS_NEXT_CHDIR(handle, name); + + + ret = SMB_VFS_NEXT_SETXATTR(handle, path, mapped_name, value, size, flags); + TALLOC_FREE(mapped_name); + + return ret; +} + +static int +catia_lsetxattr(vfs_handle_struct *handle, const char *path, + const char *name, const void *value, size_t size, + int flags) +{ + char *mapped_name = NULL; + NTSTATUS status; + ssize_t ret; + + status = catia_string_replace_allocate(handle->conn, + name, &mapped_name, TO_UNIX); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + + + ret = SMB_VFS_NEXT_LSETXATTR(handle, path, mapped_name, value, size, flags); + TALLOC_FREE(mapped_name); + + return ret; } static struct vfs_fn_pointers vfs_catia_fns = { + .mkdir = catia_mkdir, + .rmdir = catia_rmdir, .opendir = catia_opendir, - .readdir = catia_readdir, .open = catia_open, + .create_file = catia_createfile, .rename = catia_rename, .stat = catia_stat, .lstat = catia_lstat, .unlink = catia_unlink, - .chmod = catia_chmod, .chown = catia_chown, .lchown = catia_lchown, .chdir = catia_chdir, + .ntimes = catia_ntimes, + .realpath = catia_realpath, + .chflags = catia_chflags, + .streaminfo = catia_streaminfo, + .translate_name = catia_translate_name, + .get_nt_acl = catia_get_nt_acl, + .chmod_acl = catia_chmod_acl, + .sys_acl_get_file = catia_sys_acl_get_file, + .sys_acl_set_file = catia_sys_acl_set_file, + .sys_acl_delete_def_file = catia_sys_acl_delete_def_file, + .getxattr = catia_getxattr, + .lgetxattr = catia_lgetxattr, + .listxattr = catia_listxattr, + .llistxattr = catia_llistxattr, + .removexattr = catia_removexattr, + .lremovexattr = catia_lremovexattr, + .setxattr = catia_setxattr, + .lsetxattr = catia_lsetxattr, }; -NTSTATUS vfs_catia_init(void); NTSTATUS vfs_catia_init(void) { return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia", -- cgit