diff options
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/vfs.h | 5 | ||||
| -rw-r--r-- | source3/libsmb/clifile.c | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_shadow_copy.c | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_shadow_copy2.c | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 1 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 1 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 1 |
10 files changed, 11 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 297ec84a9f..d952fdd8f2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -530,7 +530,6 @@ typedef char fstring[FSTRING_LEN]; #include "libads/ads_status.h" #include "../libcli/util/error.h" -#include "ntioctl.h" #include "../lib/util/charset/charset.h" #include "dynconfig.h" #include "debugparse.h" diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 64820afedf..ad15bd8042 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -182,6 +182,7 @@ enum vfs_fallocate_mode { In particular, if new operations are added to vfs_ops, appropriate constants should be added to vfs_op_type so that order of them kept same as in vfs_ops. */ +struct shadow_copy_data; struct vfs_fn_pointers { /* Disk operations */ @@ -192,7 +193,7 @@ struct vfs_fn_pointers { uint64_t *dfree, uint64_t *dsize); int (*get_quota)(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt); int (*set_quota)(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt); - int (*get_shadow_copy_data)(struct vfs_handle_struct *handle, struct files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels); + int (*get_shadow_copy_data)(struct vfs_handle_struct *handle, struct files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels); int (*statvfs)(struct vfs_handle_struct *handle, const char *path, struct vfs_statvfs_struct *statbuf); uint32_t (*fs_capabilities)(struct vfs_handle_struct *handle, enum timestamp_set_resolution *p_ts_res); @@ -522,7 +523,7 @@ int smb_vfs_call_set_quota(struct vfs_handle_struct *handle, SMB_DISK_QUOTA *qt); int smb_vfs_call_get_shadow_copy_data(struct vfs_handle_struct *handle, struct files_struct *fsp, - SHADOW_COPY_DATA *shadow_copy_data, + struct shadow_copy_data *shadow_copy_data, bool labels); int smb_vfs_call_statvfs(struct vfs_handle_struct *handle, const char *path, struct vfs_statvfs_struct *statbuf); diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 0c6740e59c..28f59f0d88 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -23,6 +23,7 @@ #include "async_smb.h" #include "libsmb/clirap.h" #include "trans2.h" +#include "ntioctl.h" /*********************************************************** Common function for pushing stings, used by smb_bytes_push_str() diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 414e428c6c..e7c6f7ebeb 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -22,6 +22,7 @@ #include "system/time.h" #include "system/filesys.h" #include "smbd/smbd.h" +#include "ntioctl.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 024a179878..9f450e87df 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -63,6 +63,7 @@ #include "smbd/smbd.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "auth.h" +#include "ntioctl.h" static int vfs_full_audit_debug_level = DBGC_VFS; diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c index cf911d7a70..b93f98dede 100644 --- a/source3/modules/vfs_shadow_copy.c +++ b/source3/modules/vfs_shadow_copy.c @@ -19,6 +19,7 @@ #include "includes.h" #include "smbd/smbd.h" +#include "ntioctl.h" /* Please read the VFS module Samba-HowTo-Collection. diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 654e01161c..3fbe22b089 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -22,6 +22,7 @@ #include "includes.h" #include "smbd/smbd.h" #include "system/filesys.h" +#include "ntioctl.h" /* diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 84d6b6eec2..6ceeb2e2e4 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -27,6 +27,7 @@ #include "includes.h" #include "smbd/smbd.h" +#include "ntioctl.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index e981165fe1..a7da776451 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -27,6 +27,7 @@ #include "../librpc/gen_ndr/ndr_security.h" #include "passdb/lookup_sid.h" #include "auth.h" +#include "ntioctl.h" extern const struct generic_mapping file_generic_mapping; diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index bbe6e7ef1e..d8c57a6a86 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -29,6 +29,7 @@ #include "smbd/globals.h" #include "memcache.h" #include "transfer_file.h" +#include "ntioctl.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS |