-/*
+/*
* Catia VFS module
*
* Implement a fixed mapping of forbidden NT characters in filenames that are
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-static void catia_string_replace(char *s, unsigned char oldc, unsigned
- char newc)
+static char *catia_string_replace(TALLOC_CTX *ctx,
+ const char *s,
+ unsigned char oldc,
+ unsigned char newc)
{
- static smb_ucs2_t tmpbuf[sizeof(pstring)];
- smb_ucs2_t *ptr = tmpbuf;
- smb_ucs2_t old = oldc;
-
- push_ucs2(NULL, tmpbuf, s, sizeof(tmpbuf), STR_TERMINATE);
-
- for (;*ptr;ptr++)
- if (*ptr==old) *ptr=newc;
-
- pull_ucs2(NULL, s, tmpbuf, -1, sizeof(tmpbuf), STR_TERMINATE);
+ smb_ucs2_t *tmpbuf = NULL;
+ smb_ucs2_t *ptr = NULL;
+ smb_ucs2_t old = oldc;
+ char *ret = NULL;
+ size_t converted_size;
+
+ if (!s) {
+ return NULL;
+ }
+
+ if (!push_ucs2_talloc(ctx, &tmpbuf, s, &converted_size)) {
+ return NULL;
+ }
+
+ ptr = tmpbuf;
+
+ for (;*ptr;ptr++) {
+ if (*ptr==old) {
+ *ptr=newc;
+ }
+ }
+
+ if (!pull_ucs2_talloc(ctx, &ret, tmpbuf, &converted_size)) {
+ TALLOC_FREE(tmpbuf);
+ return NULL;
+ }
+ TALLOC_FREE(tmpbuf);
+ return ret;
}
-static void from_unix(char *s)
+static char *from_unix(TALLOC_CTX *ctx, const char *s)
{
- catia_string_replace(s, '\x22', '\xa8');
- catia_string_replace(s, '\x2a', '\xa4');
- catia_string_replace(s, '\x2f', '\xf8');
- catia_string_replace(s, '\x3a', '\xf7');
- catia_string_replace(s, '\x3c', '\xab');
- catia_string_replace(s, '\x3e', '\xbb');
- catia_string_replace(s, '\x3f', '\xbf');
- catia_string_replace(s, '\x5c', '\xff');
- catia_string_replace(s, '\x7c', '\xa6');
- catia_string_replace(s, ' ', '\xb1');
+ 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');
}
-static void to_unix(char *s)
+static char *to_unix(TALLOC_CTX *ctx, const char *s)
{
- catia_string_replace(s, '\xa8', '\x22');
- catia_string_replace(s, '\xa4', '\x2a');
- catia_string_replace(s, '\xf8', '\x2f');
- catia_string_replace(s, '\xf7', '\x3a');
- catia_string_replace(s, '\xab', '\x3c');
- catia_string_replace(s, '\xbb', '\x3e');
- catia_string_replace(s, '\xbf', '\x3f');
- catia_string_replace(s, '\xff', '\x5c');
- catia_string_replace(s, '\xa6', '\x7c');
- catia_string_replace(s, '\xb1', ' ');
+ 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 DIR *catia_opendir(vfs_handle_struct *handle, connection_struct
- *conn, const char *fname)
+static SMB_STRUCT_DIR *catia_opendir(vfs_handle_struct *handle,
+ const char *fname, const char *mask, uint32 attr)
{
- pstring name;
- pstrcpy(name, fname);
- to_unix(name);
+ char *name = to_unix(talloc_tos(), fname);
+
+ if (!name) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ return SMB_VFS_NEXT_OPENDIR(handle, name, mask, attr);
+}
- return SMB_VFS_NEXT_OPENDIR(handle, conn, name);
+static SMB_STRUCT_DIRENT *catia_readdir(vfs_handle_struct *handle,
+ SMB_STRUCT_DIR *dirp)
+{
+ SMB_STRUCT_DIRENT *result = NULL;
+ SMB_STRUCT_DIRENT *newdirent = NULL;
+ char *newname;
+ size_t newnamelen;
+
+ result = SMB_VFS_NEXT_READDIR(handle, dirp, NULL);
+ if (result == NULL) {
+ return result;
+ }
+
+ 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;
+ }
+ memcpy(newdirent, result, sizeof(SMB_STRUCT_DIRENT));
+ memcpy(&newdirent->d_name, newname, newnamelen);
+ return newdirent;
}
-static SMB_STRUCT_DIRENT *catia_readdir(vfs_handle_struct *handle,
- connection_struct *conn, DIR *dirp)
+static int catia_open(vfs_handle_struct *handle,
+ struct smb_filename *smb_fname,
+ files_struct *fsp,
+ int flags,
+ mode_t mode)
{
- SMB_STRUCT_DIRENT *result = SMB_VFS_NEXT_READDIR(handle, conn, dirp);
+ char *name;
+ char *tmp_base_name;
+ int ret;
+
+ name = to_unix(talloc_tos(), smb_fname->base_name);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ tmp_base_name = smb_fname->base_name;
+ smb_fname->base_name = name;
+
+ ret = SMB_VFS_NEXT_OPEN(handle, name, fsp, flags, mode);
- if (result == NULL)
- return result;
+ smb_fname->base_name = tmp_base_name;
+ TALLOC_FREE(name);
- from_unix(result->d_name);
- return result;
+ return ret;
}
-static int catia_open(vfs_handle_struct *handle, connection_struct *conn,
- const char *fname, int flags, mode_t mode)
+static int catia_rename(vfs_handle_struct *handle,
+ const char *oldname, const char *newname)
{
- pstring name;
-
- pstrcpy(name, fname);
- to_unix(name);
-
- return SMB_VFS_NEXT_OPEN(handle, conn, name, flags, mode);
+ TALLOC_CTX *ctx = talloc_tos();
+ char *oname = to_unix(ctx, oldname);
+ char *nname = to_unix(ctx, newname);
+
+ if (!oname || !nname) {
+ errno = ENOMEM;
+ return -1;
+ }
+ DEBUG(10, ("converted old name: %s\n", oname));
+ DEBUG(10, ("converted new name: %s\n", nname));
+
+ return SMB_VFS_NEXT_RENAME(handle, oname, nname);
}
-static int catia_rename(vfs_handle_struct *handle, connection_struct *conn,
- const char *old, const char *new)
+static int catia_stat(vfs_handle_struct *handle,
+ struct smb_filename *smb_fname)
{
- pstring oname, nname;
+ char *name;
+ char *tmp_base_name;
+ int ret;
+
+ name = to_unix(talloc_tos(), smb_fname->base_name);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ tmp_base_name = smb_fname->base_name;
+ smb_fname->base_name = name;
- pstrcpy(oname, old);
- to_unix(oname);
- pstrcpy(nname, new);
- to_unix(nname);
+ ret = SMB_VFS_NEXT_STAT(handle, smb_fname);
- DEBUG(10, ("converted old name: %s\n", oname));
- DEBUG(10, ("converted new name: %s\n", nname));
-
- return SMB_VFS_NEXT_RENAME(handle, conn, oname, nname);
+ smb_fname->base_name = tmp_base_name;
+ TALLOC_FREE(name);
+
+ return ret;
}
-static int catia_stat(vfs_handle_struct *handle, connection_struct *conn,
- const char *fname, SMB_STRUCT_STAT *sbuf)
+static int catia_lstat(vfs_handle_struct *handle,
+ struct smb_filename *smb_fname)
{
- pstring name;
- pstrcpy(name, fname);
- to_unix(name);
+ char *name;
+ char *tmp_base_name;
+ int ret;
+
+ name = to_unix(talloc_tos(), smb_fname->base_name);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ tmp_base_name = smb_fname->base_name;
+ smb_fname->base_name = name;
+
+ ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname);
- return SMB_VFS_NEXT_STAT(handle, conn, name, sbuf);
+ smb_fname->base_name = tmp_base_name;
+ TALLOC_FREE(name);
+
+ return ret;
}
-static int catia_lstat(vfs_handle_struct *handle, connection_struct *conn,
- const char *path, SMB_STRUCT_STAT *sbuf)
+static int catia_unlink(vfs_handle_struct *handle, const char *path)
{
- pstring name;
- pstrcpy(name, path);
- to_unix(name);
+ char *name = to_unix(talloc_tos(), path);
- return SMB_VFS_NEXT_LSTAT(handle, conn, name, sbuf);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+ return SMB_VFS_NEXT_UNLINK(handle, name);
}
-static int catia_unlink(vfs_handle_struct *handle, connection_struct *conn,
- const char *path)
+static int catia_chmod(vfs_handle_struct *handle,
+ const char *path, mode_t mode)
{
- pstring name;
- pstrcpy(name, path);
- to_unix(name);
+ char *name = to_unix(talloc_tos(), path);
- return SMB_VFS_NEXT_UNLINK(handle, conn, name);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+ return SMB_VFS_NEXT_CHMOD(handle, name, mode);
}
-static int catia_chmod(vfs_handle_struct *handle, connection_struct *conn,
- const char *path, mode_t mode)
+static int catia_chown(vfs_handle_struct *handle,
+ const char *path, uid_t uid, gid_t gid)
{
- pstring name;
- pstrcpy(name, path);
- to_unix(name);
+ char *name = to_unix(talloc_tos(), path);
- return SMB_VFS_NEXT_CHMOD(handle, conn, name, mode);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+ return SMB_VFS_NEXT_CHOWN(handle, name, uid, gid);
}
-static int catia_chown(vfs_handle_struct *handle, connection_struct *conn,
+static int catia_lchown(vfs_handle_struct *handle,
const char *path, uid_t uid, gid_t gid)
{
- pstring name;
- pstrcpy(name, path);
- to_unix(name);
+ char *name = to_unix(talloc_tos(), path);
- return SMB_VFS_NEXT_CHOWN(handle, conn, name, uid, gid);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+ return SMB_VFS_NEXT_LCHOWN(handle, name, uid, gid);
}
-static int catia_chdir(vfs_handle_struct *handle, connection_struct *conn,
+static int catia_chdir(vfs_handle_struct *handle,
const char *path)
{
- pstring name;
- pstrcpy(name, path);
- to_unix(name);
+ char *name = to_unix(talloc_tos(), path);
- return SMB_VFS_NEXT_CHDIR(handle, conn, name);
+ if (!name) {
+ errno = ENOMEM;
+ return -1;
+ }
+ return SMB_VFS_NEXT_CHDIR(handle, name);
}
-static char *catia_getwd(vfs_handle_struct *handle, connection_struct *conn,
- char *buf)
+static char *catia_getwd(vfs_handle_struct *handle, char *buf)
{
- return SMB_VFS_NEXT_GETWD(handle, conn, buf);
+ return SMB_VFS_NEXT_GETWD(handle, buf);
}
-static int catia_utime(vfs_handle_struct *handle, connection_struct *conn,
- const char *path, struct utimbuf *times)
+static int catia_ntimes(vfs_handle_struct *handle,
+ const char *path, struct smb_file_time *ft)
{
- return SMB_VFS_NEXT_UTIME(handle, conn, path, times);
+ return SMB_VFS_NEXT_NTIMES(handle, path, ft);
}
-static BOOL catia_symlink(vfs_handle_struct *handle, connection_struct *conn,
+static bool catia_symlink(vfs_handle_struct *handle,
const char *oldpath, const char *newpath)
{
- return SMB_VFS_NEXT_SYMLINK(handle, conn, oldpath, newpath);
+ return SMB_VFS_NEXT_SYMLINK(handle, oldpath, newpath);
}
-static BOOL catia_readlink(vfs_handle_struct *handle, connection_struct *conn,
+static bool catia_readlink(vfs_handle_struct *handle,
const char *path, char *buf, size_t bufsiz)
{
- return SMB_VFS_NEXT_READLINK(handle, conn, path, buf, bufsiz);
+ return SMB_VFS_NEXT_READLINK(handle, path, buf, bufsiz);
}
-static int catia_link(vfs_handle_struct *handle, connection_struct *conn,
+static int catia_link(vfs_handle_struct *handle,
const char *oldpath, const char *newpath)
{
- return SMB_VFS_NEXT_LINK(handle, conn, oldpath, newpath);
+ return SMB_VFS_NEXT_LINK(handle, oldpath, newpath);
}
-static int catia_mknod(vfs_handle_struct *handle, connection_struct *conn,
+static int catia_mknod(vfs_handle_struct *handle,
const char *path, mode_t mode, SMB_DEV_T dev)
{
- return SMB_VFS_NEXT_MKNOD(handle, conn, path, mode, dev);
+ return SMB_VFS_NEXT_MKNOD(handle, path, mode, dev);
}
-static char *catia_realpath(vfs_handle_struct *handle, connection_struct *conn,
+static char *catia_realpath(vfs_handle_struct *handle,
const char *path, char *resolved_path)
{
- return SMB_VFS_NEXT_REALPATH(handle, conn, path, resolved_path);
+ return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
}
-static size_t catia_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+static NTSTATUS catia_get_nt_acl(vfs_handle_struct *handle,
const char *name, uint32 security_info,
- struct security_descriptor_info **ppdesc)
-{
- return SMB_VFS_NEXT_GET_NT_ACL(handle, fsp, name, security_info,
- ppdesc);
-}
-
-static BOOL catia_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
- const char *name, uint32 security_info_sent,
- struct security_descriptor_info *psd)
+ struct security_descriptor **ppdesc)
{
- return SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent,
- psd);
+ return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
}
-static int catia_chmod_acl(vfs_handle_struct *handle, connection_struct *conn,
+static int catia_chmod_acl(vfs_handle_struct *handle,
const char *name, mode_t mode)
{
/* If the underlying VFS doesn't have ACL support... */
errno = ENOSYS;
return -1;
}
- return SMB_VFS_NEXT_CHMOD_ACL(handle, conn, name, mode);
+ return SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode);
}
/* VFS operations structure */
/* Directory operations */
- {SMB_VFS_OP(catia_opendir), SMB_VFS_OP_OPENDIR,
+ {SMB_VFS_OP(catia_opendir), SMB_VFS_OP_OPENDIR,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_readdir), SMB_VFS_OP_READDIR,
+ {SMB_VFS_OP(catia_readdir), SMB_VFS_OP_READDIR,
SMB_VFS_LAYER_TRANSPARENT},
/* File operations */
- {SMB_VFS_OP(catia_open), SMB_VFS_OP_OPEN,
+ {SMB_VFS_OP(catia_open), SMB_VFS_OP_OPEN,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_rename), SMB_VFS_OP_RENAME,
+ {SMB_VFS_OP(catia_rename), SMB_VFS_OP_RENAME,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_stat), SMB_VFS_OP_STAT,
+ {SMB_VFS_OP(catia_stat), SMB_VFS_OP_STAT,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_lstat), SMB_VFS_OP_LSTAT,
+ {SMB_VFS_OP(catia_lstat), SMB_VFS_OP_LSTAT,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_unlink), SMB_VFS_OP_UNLINK,
+ {SMB_VFS_OP(catia_unlink), SMB_VFS_OP_UNLINK,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_chmod), SMB_VFS_OP_CHMOD,
+ {SMB_VFS_OP(catia_chmod), SMB_VFS_OP_CHMOD,
+SMB_VFS_LAYER_TRANSPARENT},
+ {SMB_VFS_OP(catia_chown), SMB_VFS_OP_CHOWN,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_chown), SMB_VFS_OP_CHOWN,
+ {SMB_VFS_OP(catia_lchown), SMB_VFS_OP_LCHOWN,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_chdir), SMB_VFS_OP_CHDIR,
+ {SMB_VFS_OP(catia_chdir), SMB_VFS_OP_CHDIR,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_getwd), SMB_VFS_OP_GETWD,
+ {SMB_VFS_OP(catia_getwd), SMB_VFS_OP_GETWD,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_utime), SMB_VFS_OP_UTIME,
+ {SMB_VFS_OP(catia_ntimes), SMB_VFS_OP_NTIMES,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_symlink), SMB_VFS_OP_SYMLINK,
+ {SMB_VFS_OP(catia_symlink), SMB_VFS_OP_SYMLINK,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_readlink), SMB_VFS_OP_READLINK,
+ {SMB_VFS_OP(catia_readlink), SMB_VFS_OP_READLINK,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_link), SMB_VFS_OP_LINK,
+ {SMB_VFS_OP(catia_link), SMB_VFS_OP_LINK,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_mknod), SMB_VFS_OP_MKNOD,
+ {SMB_VFS_OP(catia_mknod), SMB_VFS_OP_MKNOD,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_realpath), SMB_VFS_OP_REALPATH,
+ {SMB_VFS_OP(catia_realpath), SMB_VFS_OP_REALPATH,
SMB_VFS_LAYER_TRANSPARENT},
/* NT File ACL operations */
- {SMB_VFS_OP(catia_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
-SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(catia_set_nt_acl), SMB_VFS_OP_SET_NT_ACL,
+ {SMB_VFS_OP(catia_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
SMB_VFS_LAYER_TRANSPARENT},
/* POSIX ACL operations */
- {SMB_VFS_OP(catia_chmod_acl), SMB_VFS_OP_CHMOD_ACL,
+ {SMB_VFS_OP(catia_chmod_acl), SMB_VFS_OP_CHMOD_ACL,
SMB_VFS_LAYER_TRANSPARENT},
- {NULL, SMB_VFS_OP_NOOP,
+ {NULL, SMB_VFS_OP_NOOP,
SMB_VFS_LAYER_NOOP}
};
-NTSTATUS init_module(void)
+NTSTATUS vfs_catia_init(void);
+NTSTATUS vfs_catia_init(void)
{
- return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
+ return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
catia_op_tuples);
}
git.samba.org / metze / samba / wip.git / blobdiff