summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-07-24 17:09:42 -0700
committerTim Prouty <tprouty@samba.org>2009-07-24 18:46:07 -0700
commit247a77a422192d7f270952334f06a512fcd339aa (patch)
tree375fd210a616e65b389ac39fb49df2bc54a278b4 /source3/modules
parentff547a23ae464475fa9a6f0c9b8a5d1d721dde64 (diff)
downloadsamba-247a77a422192d7f270952334f06a512fcd339aa.tar.gz
samba-247a77a422192d7f270952334f06a512fcd339aa.tar.bz2
samba-247a77a422192d7f270952334f06a512fcd339aa.zip
s3 onefs: Fix the onefs modules after the big refactoring
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/onefs.h4
-rw-r--r--source3/modules/onefs_acl.c4
-rw-r--r--source3/modules/vfs_onefs.c8
-rw-r--r--source3/modules/vfs_onefs_shadow_copy.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index e0e463778c..dd27d44cca 100644
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -126,13 +126,13 @@ NTSTATUS onefs_get_nt_acl(vfs_handle_struct *handle, const char* name,
uint32 security_info, SEC_DESC **ppdesc);
NTSTATUS onefs_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info_sent, SEC_DESC *psd);
+ uint32 security_info_sent, const SEC_DESC *psd);
/*
* Utility functions
*/
struct ifs_security_descriptor;
-NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, SEC_DESC *psd,
+NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, const SEC_DESC *psd,
struct ifs_security_descriptor *sd, int snum,
uint32_t *security_info_effective);
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 2753a9e885..df4efd58df 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -819,7 +819,7 @@ onefs_get_nt_acl(vfs_handle_struct *handle, const char* name,
*
* @return NTSTATUS_OK if successful
*/
-NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, SEC_DESC *psd,
+NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, const SEC_DESC *psd,
struct ifs_security_descriptor *sd, int snum,
uint32_t *security_info_effective)
{
@@ -905,7 +905,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, SEC_DESC *psd,
*/
NTSTATUS
onefs_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
- uint32_t sec_info_sent, SEC_DESC *psd)
+ uint32_t sec_info_sent, const SEC_DESC *psd)
{
struct ifs_security_descriptor sd = {};
int fd = -1;
diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c
index 05f6cfdc74..31f0b853fb 100644
--- a/source3/modules/vfs_onefs.c
+++ b/source3/modules/vfs_onefs.c
@@ -108,7 +108,7 @@ static uint64_t onefs_get_alloc_size(struct vfs_handle_struct *handle,
}
static struct file_id onefs_file_id_create(struct vfs_handle_struct *handle,
- SMB_STRUCT_STAT *sbuf)
+ const SMB_STRUCT_STAT *sbuf)
{
struct file_id key;
@@ -247,19 +247,19 @@ static uint32_t onefs_fs_capabilities(struct vfs_handle_struct *handle)
}
static struct vfs_fn_pointers onefs_fns = {
- .connect = onefs_connect,
+ .connect_fn = onefs_connect,
.fs_capabilities = onefs_fs_capabilities,
.opendir = onefs_opendir,
.readdir = onefs_readdir,
.seekdir = onefs_seekdir,
.telldir = onefs_telldir,
- .rewinddir = onefs_rewinddir,
+ .rewind_dir = onefs_rewinddir,
.mkdir = onefs_mkdir,
.closedir = onefs_closedir,
.init_search_op = onefs_init_search_op,
.open = onefs_open,
.create_file = onefs_create_file,
- .close = onefs_close,
+ .close_fn = onefs_close,
.sendfile = onefs_sendfile,
.recvfile = onefs_recvfile,
.rename = onefs_rename,
diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c
index b8febdc426..c733392d27 100644
--- a/source3/modules/vfs_onefs_shadow_copy.c
+++ b/source3/modules/vfs_onefs_shadow_copy.c
@@ -397,7 +397,7 @@ onefs_shadow_copy_ntimes(vfs_handle_struct *handle,
/**
* XXX: macro-ize
*/
-static bool
+static int
onefs_shadow_copy_symlink(vfs_handle_struct *handle,
const char *oldpath, const char *newpath)
{
@@ -671,7 +671,7 @@ static struct vfs_fn_pointers onefs_shadow_copy_fns = {
.chdir = onefs_shadow_copy_chdir,
.ntimes = onefs_shadow_copy_ntimes,
.symlink = onefs_shadow_copy_symlink,
- .readlink = onefs_shadow_copy_readlink,
+ .vfs_readlink = onefs_shadow_copy_readlink,
.link = onefs_shadow_copy_link,
.mknod = onefs_shadow_copy_mknod,
.realpath = onefs_shadow_copy_realpath,