s3:registry: use regsubkey_ctr_get_seqnum() in reg_backend_db.c

[amitay/samba.git] / source3 / modules / vfs_shadow_copy2.c

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index ddbc5aab1819a927cadc48201a94a9e9efcf57b2..9eaf8ee8512999b48c471d90b212c9069a24cb50 100644 (file)
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -393,9 +393,9 @@ static int shadow_copy2_chdir(vfs_handle_struct *handle,
 }
 
 static int shadow_copy2_ntimes(vfs_handle_struct *handle,
-                      const char *fname, const struct timespec ts[2])
+                      const char *fname, struct smb_file_time *ft)
 {
-        SHADOW2_NEXT(NTIMES, (handle, name, ts), int, -1);
+        SHADOW2_NEXT(NTIMES, (handle, name, ft), int, -1);
 }
 
 static int shadow_copy2_readlink(vfs_handle_struct *handle,
@@ -423,13 +423,6 @@ static NTSTATUS shadow_copy2_get_nt_acl(vfs_handle_struct *handle,
         SHADOW2_NTSTATUS_NEXT(GET_NT_ACL, (handle, name, security_info, ppdesc), NT_STATUS_ACCESS_DENIED);
 }
 
-static NTSTATUS shadow_copy2_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                            const char *fname, uint32 security_info_sent,
-                            struct security_descriptor *psd)
-{
-        SHADOW2_NTSTATUS_NEXT(SET_NT_ACL, (handle, fsp, name, security_info_sent, psd), NT_STATUS_ACCESS_DENIED);
-}
-
 static int shadow_copy2_mkdir(vfs_handle_struct *handle,  const char *fname, mode_t mode)
 {
         SHADOW2_NEXT(MKDIR, (handle, name, mode), int, -1);
@@ -531,7 +524,7 @@ static int shadow_copy2_get_shadow_copy2_data(vfs_handle_struct *handle,
        shadow_copy2_data->num_volumes = 0;
        shadow_copy2_data->labels      = NULL;
 
-       while ((d = SMB_VFS_NEXT_READDIR(handle, p))) {
+       while ((d = SMB_VFS_NEXT_READDIR(handle, p, NULL))) {
                SHADOW_COPY_LABEL *tlabels;
 
                /* ignore names not of the right form in the snapshot directory */
@@ -601,7 +594,6 @@ static vfs_op_tuple shadow_copy2_ops[] = {
 
         /* NT File ACL operations */
         {SMB_VFS_OP(shadow_copy2_get_nt_acl), SMB_VFS_OP_GET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
-        {SMB_VFS_OP(shadow_copy2_set_nt_acl), SMB_VFS_OP_SET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
 
         /* POSIX ACL operations */
         {SMB_VFS_OP(shadow_copy2_chmod_acl), SMB_VFS_OP_CHMOD_ACL, SMB_VFS_LAYER_TRANSPARENT},