Changeset 740 for vendor/current/examples/VFS

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/examples/VFS

Files:

• shadow_copy_test.c (modified) (4 diffs)
• skel_opaque.c (modified) (14 diffs)
• skel_transparent.c (modified) (14 diffs)

vendor/current/examples/VFS/shadow_copy_test.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "ntioctl.h"
+#include "smbd/proto.h"
 
 #undef DBGC_CLASS
@@ -51 +53 @@
 */
 
-static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+static int test_get_shadow_copy_data(vfs_handle_struct *handle,
+                                    files_struct *fsp,
+                                    struct shadow_copy_data *shadow_copy_data,
+                                    bool labels)
 {
         uint32 num = 3;
@@ -60 +65 @@
         if (labels) {   
                 if (num) {
-                        shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
+                        shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data,SHADOW_COPY_LABEL,num);
                 } else {
                         shadow_copy_data->labels = NULL;
@@ -82 +87 @@
 NTSTATUS vfs_shadow_copy_test_init(void)
 {
-        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "shadow_copy_test", &vfs_test_shadow_copy_fns);
+        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
+                                "shadow_copy_test",
+                                &vfs_test_shadow_copy_fns);
 }

vendor/current/examples/VFS/skel_opaque.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "smbd/proto.h"
 
 /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
@@ -66 +67 @@
 }
 
-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
 {
         errno = ENOSYS;
@@ -84 +85 @@
 
 static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
+{
+        return NULL;
+}
+
+static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
 {
         return NULL;
@@ -151 +157 @@
                                 uint32_t oplock_request,
                                 uint64_t allocation_size,
+                                uint32_t private_flags,
                                 struct security_descriptor *sd,
                                 struct ea_list *ea_list,
@@ -308 +315 @@
 }
 
+static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
+                        enum vfs_fallocate_mode mode,
+                        SMB_OFF_T offset, SMB_OFF_T len)
+{
+        errno = ENOSYS;
+        return -1;
+}
+
 static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
 {
@@ -356 +371 @@
 }
 
-static char *skel_realpath(vfs_handle_struct *handle,  const char *path, char *resolved_path)
+static char *skel_realpath(vfs_handle_struct *handle,  const char *path)
 {
         errno = ENOSYS;
@@ -464 +479 @@
 
 static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-        uint32 security_info, SEC_DESC **ppdesc)
+        uint32 security_info, struct security_descriptor **ppdesc)
 {
         return NT_STATUS_NOT_IMPLEMENTED;
@@ -470 +485 @@
 
 static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-        const char *name, uint32 security_info, SEC_DESC **ppdesc)
+        const char *name, uint32 security_info, struct security_descriptor **ppdesc)
 {
         return NT_STATUS_NOT_IMPLEMENTED;
@@ -476 +491 @@
 
 static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-        uint32 security_info_sent, const SEC_DESC *psd)
+        uint32 security_info_sent, const struct security_descriptor *psd)
 {
         return NT_STATUS_NOT_IMPLEMENTED;
@@ -747 +762 @@
 }
 
-static bool skel_is_offline(struct vfs_handle_struct *handle, const char *path, SMB_STRUCT_STAT *sbuf)
+static bool skel_is_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname, SMB_STRUCT_STAT *sbuf)
 {
         errno = ENOSYS;
@@ -753 +768 @@
 }
 
-static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
+static int skel_set_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname)
 {
         errno = ENOSYS;
@@ -776 +791 @@
 
         .opendir = skel_opendir,
+        .fdopendir = skel_fdopendir,
         .readdir = skel_readdir,
         .seekdir = skel_seekdir,
@@ -787 +803 @@
         /* File operations */
 
-        .open = skel_open,
+        .open_fn = skel_open,
         .create_file = skel_create_file,
         .close_fn = skel_close_fn,
@@ -813 +829 @@
         .ntimes = skel_ntimes,
         .ftruncate = skel_ftruncate,
+        .fallocate = skel_fallocate,
         .lock = skel_lock,
         .kernel_flock = skel_kernel_flock,

vendor/current/examples/VFS/skel_transparent.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "smbd/proto.h"
 
 /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
@@ -65 +66 @@
 }
 
-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
 {
         return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
@@ -83 +84 @@
 {
         return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
+}
+
+static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+{
+        return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 }
 
@@ -144 +150 @@
                                 uint32_t oplock_request,
                                 uint64_t allocation_size,
+                                uint32_t private_flags,
                                 struct security_descriptor *sd,
                                 struct ea_list *ea_list,
@@ -160 +167 @@
                                 oplock_request,
                                 allocation_size,
+                                private_flags,
                                 sd,
                                 ea_list,
@@ -291 +299 @@
 }
 
+static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
+                        enum vfs_fallocate_mode mode,
+                        SMB_OFF_T offset,
+                        SMB_OFF_T len)
+{
+        return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
+}
+
 static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
 {
@@ -331 +347 @@
 }
 
-static char *skel_realpath(vfs_handle_struct *handle,  const char *path, char *resolved_path)
-{
-        return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
+static char *skel_realpath(vfs_handle_struct *handle,  const char *path)
+{
+        return SMB_VFS_NEXT_REALPATH(handle, path);
 }
 
@@ -454 +470 @@
 
 static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-        uint32 security_info, SEC_DESC **ppdesc)
+        uint32 security_info, struct security_descriptor **ppdesc)
 {
         return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
@@ -460 +476 @@
 
 static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-        const char *name, uint32 security_info, SEC_DESC **ppdesc)
+        const char *name, uint32 security_info, struct security_descriptor **ppdesc)
 {
         return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
@@ -466 +482 @@
 
 static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-        uint32 security_info_sent, const SEC_DESC *psd)
+        uint32 security_info_sent, const struct security_descriptor *psd)
 {
         return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
@@ -692 +708 @@
 }
 
-static bool skel_is_offline(struct vfs_handle_struct *handle, const char *path, SMB_STRUCT_STAT *sbuf)
-{
-        return SMB_VFS_NEXT_IS_OFFLINE(handle, path, sbuf);
-}
-
-static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
-{
-        return SMB_VFS_NEXT_SET_OFFLINE(handle, path);
+static bool skel_is_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname, SMB_STRUCT_STAT *sbuf)
+{
+        return SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
+}
+
+static int skel_set_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname)
+{
+        return SMB_VFS_NEXT_SET_OFFLINE(handle, fname);
 }
 
@@ -719 +735 @@
 
         .opendir = skel_opendir,
+        .fdopendir = skel_fdopendir,
         .readdir = skel_readdir,
         .seekdir = skel_seekdir,
@@ -730 +747 @@
         /* File operations */
 
-        .open = skel_open,
+        .open_fn = skel_open,
         .create_file = skel_create_file,
         .close_fn = skel_close_fn,
@@ -756 +773 @@
         .ntimes = skel_ntimes,
         .ftruncate = skel_ftruncate,
+        .fallocate = skel_fallocate,
         .lock = skel_lock,
         .kernel_flock = skel_kernel_flock,