vfs: Remove type parameter from sys_acl_blob_get_{fd,file}
[kai/samba.git] / source3 / include / vfs.h
index 09d38f37062c0f4b549e0526d06cf1fd4c57d873..2992c1db32167f0db182960b1968d67a51b06eb2 100644 (file)
 /* Leave at 29 - not yet released. add SMB_VFS_GET_DFS_REFERRAL() - metze */
 /* Leave at 29 - not yet released. Remove l{list,get,set,remove}xattr - abartlet */
 /* Leave at 29 - not yet released. move to plain off_t - abartlet */
-#define SMB_VFS_INTERFACE_VERSION 29
+/* Leave at 29 - not yet released. Remove sys_acl functions other than set and get - abartlet */
+/* Leave at 29 - not yet released. Added backup_intent bool to files_struct - JRA */
+/* Leave at 29 - not yet released. Add durable handle functions - metze/obnox */
+/* Leave at 29 - not yet released. Added sys_acl_blob_get_file and sys_acl_blob_get_fd */
+/* Bump to version 30 - Samba 4.0.0 will ship with interface version 30 */
+/* Leave at 30 - not yet released. Added conn->cwd to save vfs_GetWd() calls. */
+/* Leave at 30 - not yet released. Changed sys_acl_blob_get_file interface to remove type */
+#define SMB_VFS_INTERFACE_VERSION 30
 
 /*
     All intercepted VFS operations must be declared as static functions inside module source
@@ -167,6 +174,287 @@ typedef union unid_t {
        gid_t gid;
 } unid_t;
 
+struct fd_handle {
+       size_t ref_count;
+       int fd;
+       uint64_t position_information;
+       off_t pos;
+       uint32 private_options; /* NT Create options, but we only look at
+                                * NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and
+                                * NTCREATEX_OPTIONS_PRIVATE_DENY_FCB and
+                                * NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE
+                                * for print files *only*, where
+                                * DELETE_ON_CLOSE is not stored in the share
+                                * mode database.
+                                */
+       unsigned long gen_id;
+};
+
+typedef struct files_struct {
+       struct files_struct *next, *prev;
+       uint64_t fnum;
+       struct smbXsrv_open *op;
+       struct connection_struct *conn;
+       struct fd_handle *fh;
+       unsigned int num_smb_operations;
+       struct file_id file_id;
+       uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */
+       uint16 file_pid;
+       uint64_t vuid; /* SMB2 compat */
+       struct write_cache *wcp;
+       struct timeval open_time;
+       uint32 access_mask;             /* NTCreateX access bits (FILE_READ_DATA etc.) */
+       uint32 share_access;            /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */
+
+       bool update_write_time_triggered;
+       struct timed_event *update_write_time_event;
+       bool update_write_time_on_close;
+       struct timespec close_write_time;
+       bool write_time_forced;
+
+       int oplock_type;
+       int sent_oplock_break;
+       struct timed_event *oplock_timeout;
+       struct lock_struct last_lock_failure;
+       int current_lock_count; /* Count the number of outstanding locks and pending locks. */
+
+       struct share_mode_entry *pending_break_messages;
+       int num_pending_break_messages;
+
+       bool can_lock;
+       bool can_read;
+       bool can_write;
+       bool modified;
+       bool is_directory;
+       bool aio_write_behind;
+       bool lockdb_clean;
+       bool initial_delete_on_close; /* Only set at NTCreateX if file was created. */
+       bool delete_on_close;
+       bool posix_open;
+       bool is_sparse;
+       bool backup_intent; /* Handle was successfully opened with backup intent
+                               and opener has privilege to do so. */
+       struct smb_filename *fsp_name;
+       uint32_t name_hash;             /* Jenkins hash of full pathname. */
+       uint64_t mid;                   /* Mid of the operation that created us. */
+
+       struct vfs_fsp_data *vfs_extension;
+       struct fake_file_handle *fake_file_handle;
+
+       struct notify_change_buf *notify;
+
+       struct files_struct *base_fsp; /* placeholder for delete on close */
+
+       /*
+        * Read-only cached brlock record, thrown away when the
+        * brlock.tdb seqnum changes. This avoids fetching data from
+        * the brlock.tdb on every read/write call.
+        */
+       int brlock_seqnum;
+       struct byte_range_lock *brlock_rec;
+
+       struct dptr_struct *dptr;
+
+       /* if not NULL, means this is a print file */
+       struct print_file_data *print_file;
+
+       unsigned num_aio_requests;
+       struct tevent_req **aio_requests;
+
+       /*
+        * If a close request comes in while we still have aio_requests
+        * around, we need to hold back the close. When all aio_requests are
+        * done, the aio completion routines need tevent_wait_done() on
+        * this. A bit ugly, but before we have close_file() fully async
+        * possibly the simplest approach. Thanks, Jeremy for the idea.
+        */
+       struct tevent_req *deferred_close;
+} files_struct;
+
+struct vuid_cache_entry {
+       struct auth_session_info *session_info;
+       uint64_t vuid; /* SMB2 compat */
+       bool read_only;
+};
+
+struct vuid_cache {
+       unsigned int next_entry;
+       struct vuid_cache_entry array[VUID_CACHE_SIZE];
+};
+
+typedef struct {
+       char *name;
+       bool is_wild;
+} name_compare_entry;
+
+struct dfree_cached_info {
+       time_t last_dfree_time;
+       uint64_t dfree_ret;
+       uint64_t bsize;
+       uint64_t dfree;
+       uint64_t dsize;
+};
+
+struct share_params {
+       int service;
+};
+
+typedef struct connection_struct {
+       struct connection_struct *next, *prev;
+       struct smbd_server_connection *sconn; /* can be NULL */
+       struct smbXsrv_tcon *tcon; /* can be NULL */
+       uint32_t cnum; /* an index passed over the wire */
+       struct share_params *params;
+       bool force_user;
+       struct vuid_cache vuid_cache;
+       bool printer;
+       bool ipc;
+       bool read_only; /* Attributes for the current user of the share. */
+       uint32_t share_access;
+       /* Does this filesystem honor
+          sub second timestamps on files
+          and directories when setting time ? */
+       enum timestamp_set_resolution ts_res;
+       char *connectpath;
+       char *origpath;
+       char *cwd; /* Working directory. */
+
+       struct vfs_handle_struct *vfs_handles;          /* for the new plugins */
+
+       /*
+        * This represents the user information on this connection. Depending
+        * on the vuid using this tid, this might change per SMB request.
+        */
+       struct auth_session_info *session_info;
+
+       /*
+        * If the "force group" parameter is set, this is the primary gid that
+        * may be used in the users token, depending on the vuid using this tid.
+        */
+       gid_t force_group_gid;
+
+       uint64_t vuid; /* vuid of user who *opened* this connection, or UID_FIELD_INVALID */
+
+       time_t lastused;
+       time_t lastused_count;
+       int num_files_open;
+       unsigned int num_smb_operations; /* Count of smb operations on this tree. */
+       int encrypt_level;
+       bool encrypted_tid;
+
+       /* Semantics requested by the client or forced by the server config. */
+       bool case_sensitive;
+       bool case_preserve;
+       bool short_case_preserve;
+
+       /* Semantics provided by the underlying filesystem. */
+       int fs_capabilities;
+       /* Device number of the directory of the share mount.
+          Used to ensure unique FileIndex returns. */
+       SMB_DEV_T base_share_dev;
+
+       name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
+       name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
+       name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */       
+       name_compare_entry *aio_write_behind_list; /* Per-share list of files to use aio write behind on. */       
+       struct dfree_cached_info *dfree_info;
+       struct trans_state *pending_trans;
+
+       struct rpc_pipe_client *spoolss_pipe;
+
+} connection_struct;
+
+struct smbd_smb2_request;
+struct privilege_paths;
+
+struct smb_request {
+       uint8_t cmd;
+       uint16 flags2;
+       uint16 smbpid;
+       uint64_t mid; /* For compatibility with SMB2. */
+       uint32_t seqnum;
+       uint64_t vuid; /* For compatibility with SMB2. */
+       uint32_t tid;
+       uint8  wct;
+       const uint16_t *vwv;
+       uint16_t buflen;
+       const uint8_t *buf;
+       const uint8 *inbuf;
+
+       /*
+        * Async handling in the main smb processing loop is directed by
+        * outbuf: reply_xxx routines indicate sync behaviour by putting their
+        * reply into "outbuf". If they leave it as NULL, they take care of it
+        * themselves, possibly later.
+        *
+        * If async handling is wanted, the reply_xxx routine must make sure
+        * that it talloc_move()s the smb_req somewhere else.
+        */
+       uint8 *outbuf;
+
+       size_t unread_bytes;
+       bool encrypted;
+       connection_struct *conn;
+       struct smbd_server_connection *sconn;
+       struct smb_perfcount_data pcd;
+
+       /*
+        * Chained request handling
+        */
+       struct files_struct *chain_fsp;
+
+       /*
+        * state information for async smb handling
+        */
+       void *async_priv;
+
+       /*
+        * Back pointer to smb2 request.
+        */
+       struct smbd_smb2_request *smb2req;
+
+       /*
+        * Pathnames used if request done
+        * under privilege.
+        */
+       struct privilege_paths *priv_paths;
+
+       /*
+        * Request list for chained requests, we're part of it.
+        */
+       struct smb_request **chain;
+
+       struct timeval request_time;
+};
+
+/*
+ * Info about an alternate data stream
+ */
+
+struct stream_struct {
+       off_t size;
+       off_t alloc_size;
+       char *name;
+};
+
+/* time info */
+struct smb_file_time {
+       struct timespec mtime;
+       struct timespec atime;
+       struct timespec ctime;
+       struct timespec create_time;
+};
+
+/*
+ * smb_filename
+ */
+struct smb_filename {
+       char *base_name;
+       char *stream_name;
+       char *original_lcomp;
+       SMB_STRUCT_STAT st;
+};
+
 #define VFS_FIND(__fn__) while (handle->fns->__fn__##_fn==NULL) { \
                                handle = handle->next; \
                         }
@@ -248,8 +536,22 @@ struct vfs_fn_pointers {
        int (*close_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
        ssize_t (*read_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n);
        ssize_t (*pread_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n, off_t offset);
+       struct tevent_req *(*pread_send_fn)(struct vfs_handle_struct *handle,
+                                           TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct files_struct *fsp,
+                                           void *data,
+                                           size_t n, off_t offset);
+       ssize_t (*pread_recv_fn)(struct tevent_req *req, int *err);
        ssize_t (*write_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n);
        ssize_t (*pwrite_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, off_t offset);
+       struct tevent_req *(*pwrite_send_fn)(struct vfs_handle_struct *handle,
+                                            TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct files_struct *fsp,
+                                            const void *data,
+                                            size_t n, off_t offset);
+       ssize_t (*pwrite_recv_fn)(struct tevent_req *req, int *err);
        off_t (*lseek_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t offset, int whence);
        ssize_t (*sendfile_fn)(struct vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *header, off_t offset, size_t count);
        ssize_t (*recvfile_fn)(struct vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t count);
@@ -257,6 +559,11 @@ struct vfs_fn_pointers {
                         const struct smb_filename *smb_fname_src,
                         const struct smb_filename *smb_fname_dst);
        int (*fsync_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
+       struct tevent_req *(*fsync_send_fn)(struct vfs_handle_struct *handle,
+                                           TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct files_struct *fsp);
+       int (*fsync_recv_fn)(struct tevent_req *req, int *err);
        int (*stat_fn)(struct vfs_handle_struct *handle, struct smb_filename *smb_fname);
        int (*fstat_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_STAT *sbuf);
        int (*lstat_fn)(struct vfs_handle_struct *handle, struct smb_filename *smb_filename);
@@ -365,10 +672,12 @@ struct vfs_fn_pointers {
        NTSTATUS (*fget_nt_acl_fn)(struct vfs_handle_struct *handle,
                                   struct files_struct *fsp,
                                   uint32 security_info,
+                                  TALLOC_CTX *mem_ctx,
                                   struct security_descriptor **ppdesc);
        NTSTATUS (*get_nt_acl_fn)(struct vfs_handle_struct *handle,
                                  const char *name,
                                  uint32 security_info,
+                                  TALLOC_CTX *mem_ctx,
                                  struct security_descriptor **ppdesc);
        NTSTATUS (*fset_nt_acl_fn)(struct vfs_handle_struct *handle,
                                   struct files_struct *fsp,
@@ -386,28 +695,24 @@ struct vfs_fn_pointers {
        int (*chmod_acl_fn)(struct vfs_handle_struct *handle, const char *name, mode_t mode);
        int (*fchmod_acl_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode);
 
-       int (*sys_acl_get_entry_fn)(struct vfs_handle_struct *handle, SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
-       int (*sys_acl_get_tag_type_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
-       int (*sys_acl_get_permset_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
-       void * (*sys_acl_get_qualifier_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry_d);
-       SMB_ACL_T (*sys_acl_get_file_fn)(struct vfs_handle_struct *handle, const char *path_p, SMB_ACL_TYPE_T type);
-       SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
-       int (*sys_acl_clear_perms_fn)(struct vfs_handle_struct *handle, SMB_ACL_PERMSET_T permset);
-       int (*sys_acl_add_perm_fn)(struct vfs_handle_struct *handle, SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
-       char * (*sys_acl_to_text_fn)(struct vfs_handle_struct *handle, SMB_ACL_T theacl, ssize_t *plen);
-       SMB_ACL_T (*sys_acl_init_fn)(struct vfs_handle_struct *handle, int count);
-       int (*sys_acl_create_entry_fn)(struct vfs_handle_struct *handle, SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
-       int (*sys_acl_set_tag_type_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype);
-       int (*sys_acl_set_qualifier_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry, void *qual);
-       int (*sys_acl_set_permset_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset);
-       int (*sys_acl_valid_fn)(struct vfs_handle_struct *handle, SMB_ACL_T theacl );
+       SMB_ACL_T (*sys_acl_get_file_fn)(struct vfs_handle_struct *handle,
+                                        const char *path_p,
+                                        SMB_ACL_TYPE_T type,
+                                        TALLOC_CTX *mem_ctx);
+       SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle,
+                                      struct files_struct *fsp,
+                                      TALLOC_CTX *mem_ctx);
+       int (*sys_acl_blob_get_file_fn)(struct vfs_handle_struct *handle,
+                                       const char *path_p,
+                                       TALLOC_CTX *mem_ctx,
+                                       char **blob_description,
+                                       DATA_BLOB *blob);
+       int (*sys_acl_blob_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp,
+                                     TALLOC_CTX *mem_ctx, char **blob_description,
+                                     DATA_BLOB *blob);
        int (*sys_acl_set_file_fn)(struct vfs_handle_struct *handle, const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
        int (*sys_acl_set_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T theacl);
        int (*sys_acl_delete_def_file_fn)(struct vfs_handle_struct *handle, const char *path);
-       int (*sys_acl_get_perm_fn)(struct vfs_handle_struct *handle, SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
-       int (*sys_acl_free_text_fn)(struct vfs_handle_struct *handle, char *text);
-       int (*sys_acl_free_acl_fn)(struct vfs_handle_struct *handle, SMB_ACL_T posix_acl);
-       int (*sys_acl_free_qualifier_fn)(struct vfs_handle_struct *handle, void *qualifier, SMB_ACL_TAG_T tagtype);
 
        /* EA operations. */
        ssize_t (*getxattr_fn)(struct vfs_handle_struct *handle,const char *path, const char *name, void *value, size_t size);
@@ -420,13 +725,6 @@ struct vfs_fn_pointers {
        int (*fsetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags);
 
        /* aio operations */
-       int (*aio_read_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-       int (*aio_write_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-       ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-       int (*aio_cancel_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-       int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-       int (*aio_fsync_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb);
-       int (*aio_suspend_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout);
        bool (*aio_force_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
 
        /* offline operations */
@@ -435,6 +733,24 @@ struct vfs_fn_pointers {
                           SMB_STRUCT_STAT *sbuf);
        int (*set_offline_fn)(struct vfs_handle_struct *handle,
                           const struct smb_filename *fname);
+
+       /* durable handle operations */
+       NTSTATUS (*durable_cookie_fn)(struct vfs_handle_struct *handle,
+                                     struct files_struct *fsp,
+                                     TALLOC_CTX *mem_ctx,
+                                     DATA_BLOB *cookie);
+       NTSTATUS (*durable_disconnect_fn)(struct vfs_handle_struct *handle,
+                                         struct files_struct *fsp,
+                                         const DATA_BLOB old_cookie,
+                                         TALLOC_CTX *mem_ctx,
+                                         DATA_BLOB *new_cookie);
+       NTSTATUS (*durable_reconnect_fn)(struct vfs_handle_struct *handle,
+                                        struct smb_request *smb1req,
+                                        struct smbXsrv_open *op,
+                                        const DATA_BLOB old_cookie,
+                                        TALLOC_CTX *mem_ctx,
+                                        struct files_struct **fsp,
+                                        DATA_BLOB *new_cookie);
 };
 
 /*
@@ -611,12 +927,28 @@ ssize_t smb_vfs_call_read(struct vfs_handle_struct *handle,
 ssize_t smb_vfs_call_pread(struct vfs_handle_struct *handle,
                           struct files_struct *fsp, void *data, size_t n,
                           off_t offset);
+struct tevent_req *smb_vfs_call_pread_send(struct vfs_handle_struct *handle,
+                                          TALLOC_CTX *mem_ctx,
+                                          struct tevent_context *ev,
+                                          struct files_struct *fsp,
+                                          void *data,
+                                          size_t n, off_t offset);
+ssize_t SMB_VFS_PREAD_RECV(struct tevent_req *req, int *perrno);
+
 ssize_t smb_vfs_call_write(struct vfs_handle_struct *handle,
                           struct files_struct *fsp, const void *data,
                           size_t n);
 ssize_t smb_vfs_call_pwrite(struct vfs_handle_struct *handle,
                            struct files_struct *fsp, const void *data,
                            size_t n, off_t offset);
+struct tevent_req *smb_vfs_call_pwrite_send(struct vfs_handle_struct *handle,
+                                           TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct files_struct *fsp,
+                                           const void *data,
+                                           size_t n, off_t offset);
+ssize_t SMB_VFS_PWRITE_RECV(struct tevent_req *req, int *perrno);
+
 off_t smb_vfs_call_lseek(struct vfs_handle_struct *handle,
                             struct files_struct *fsp, off_t offset,
                             int whence);
@@ -631,6 +963,13 @@ int smb_vfs_call_rename(struct vfs_handle_struct *handle,
                        const struct smb_filename *smb_fname_dst);
 int smb_vfs_call_fsync(struct vfs_handle_struct *handle,
                       struct files_struct *fsp);
+
+struct tevent_req *smb_vfs_call_fsync_send(struct vfs_handle_struct *handle,
+                                          TALLOC_CTX *mem_ctx,
+                                          struct tevent_context *ev,
+                                          struct files_struct *fsp);
+int SMB_VFS_FSYNC_RECV(struct tevent_req *req, int *perrno);
+
 int smb_vfs_call_stat(struct vfs_handle_struct *handle,
                      struct smb_filename *smb_fname);
 int smb_vfs_call_fstat(struct vfs_handle_struct *handle,
@@ -745,10 +1084,12 @@ NTSTATUS smb_vfs_call_fsctl(struct vfs_handle_struct *handle,
 NTSTATUS smb_vfs_call_fget_nt_acl(struct vfs_handle_struct *handle,
                                  struct files_struct *fsp,
                                  uint32 security_info,
+                                 TALLOC_CTX *mem_ctx,
                                  struct security_descriptor **ppdesc);
 NTSTATUS smb_vfs_call_get_nt_acl(struct vfs_handle_struct *handle,
                                 const char *name,
                                 uint32 security_info,
+                                TALLOC_CTX *mem_ctx,
                                 struct security_descriptor **ppdesc);
 NTSTATUS smb_vfs_call_fset_nt_acl(struct vfs_handle_struct *handle,
                                  struct files_struct *fsp,
@@ -763,43 +1104,23 @@ int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle, const char *name,
                           mode_t mode);
 int smb_vfs_call_fchmod_acl(struct vfs_handle_struct *handle,
                            struct files_struct *fsp, mode_t mode);
-int smb_vfs_call_sys_acl_get_entry(struct vfs_handle_struct *handle,
-                                  SMB_ACL_T theacl, int entry_id,
-                                  SMB_ACL_ENTRY_T *entry_p);
-int smb_vfs_call_sys_acl_get_tag_type(struct vfs_handle_struct *handle,
-                                     SMB_ACL_ENTRY_T entry_d,
-                                     SMB_ACL_TAG_T *tag_type_p);
-int smb_vfs_call_sys_acl_get_permset(struct vfs_handle_struct *handle,
-                                    SMB_ACL_ENTRY_T entry_d,
-                                    SMB_ACL_PERMSET_T *permset_p);
-void * smb_vfs_call_sys_acl_get_qualifier(struct vfs_handle_struct *handle,
-                                         SMB_ACL_ENTRY_T entry_d);
 SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle,
                                        const char *path_p,
-                                       SMB_ACL_TYPE_T type);
+                                       SMB_ACL_TYPE_T type,
+                                       TALLOC_CTX *mem_ctx);
 SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle,
-                                     struct files_struct *fsp);
-int smb_vfs_call_sys_acl_clear_perms(struct vfs_handle_struct *handle,
-                                    SMB_ACL_PERMSET_T permset);
-int smb_vfs_call_sys_acl_add_perm(struct vfs_handle_struct *handle,
-                                 SMB_ACL_PERMSET_T permset,
-                                 SMB_ACL_PERM_T perm);
-char * smb_vfs_call_sys_acl_to_text(struct vfs_handle_struct *handle,
-                                   SMB_ACL_T theacl, ssize_t *plen);
-SMB_ACL_T smb_vfs_call_sys_acl_init(struct vfs_handle_struct *handle,
-                                   int count);
-int smb_vfs_call_sys_acl_create_entry(struct vfs_handle_struct *handle,
-                                     SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
-int smb_vfs_call_sys_acl_set_tag_type(struct vfs_handle_struct *handle,
-                                     SMB_ACL_ENTRY_T entry,
-                                     SMB_ACL_TAG_T tagtype);
-int smb_vfs_call_sys_acl_set_qualifier(struct vfs_handle_struct *handle,
-                                      SMB_ACL_ENTRY_T entry, void *qual);
-int smb_vfs_call_sys_acl_set_permset(struct vfs_handle_struct *handle,
-                                    SMB_ACL_ENTRY_T entry,
-                                    SMB_ACL_PERMSET_T permset);
-int smb_vfs_call_sys_acl_valid(struct vfs_handle_struct *handle,
-                              SMB_ACL_T theacl);
+                                     struct files_struct *fsp,
+                                     TALLOC_CTX *mem_ctx);
+int smb_vfs_call_sys_acl_blob_get_file(struct vfs_handle_struct *handle,
+                                      const char *path_p,
+                                      TALLOC_CTX *mem_ctx,
+                                      char **blob_description,
+                                      DATA_BLOB *blob);
+int smb_vfs_call_sys_acl_blob_get_fd(struct vfs_handle_struct *handle,
+                                    struct files_struct *fsp,  
+                                    TALLOC_CTX *mem_ctx,
+                                    char **blob_description,
+                                    DATA_BLOB *blob);
 int smb_vfs_call_sys_acl_set_file(struct vfs_handle_struct *handle,
                                  const char *name, SMB_ACL_TYPE_T acltype,
                                  SMB_ACL_T theacl);
@@ -807,15 +1128,6 @@ int smb_vfs_call_sys_acl_set_fd(struct vfs_handle_struct *handle,
                                struct files_struct *fsp, SMB_ACL_T theacl);
 int smb_vfs_call_sys_acl_delete_def_file(struct vfs_handle_struct *handle,
                                         const char *path);
-int smb_vfs_call_sys_acl_get_perm(struct vfs_handle_struct *handle,
-                                 SMB_ACL_PERMSET_T permset,
-                                 SMB_ACL_PERM_T perm);
-int smb_vfs_call_sys_acl_free_text(struct vfs_handle_struct *handle,
-                                  char *text);
-int smb_vfs_call_sys_acl_free_acl(struct vfs_handle_struct *handle,
-                                 SMB_ACL_T posix_acl);
-int smb_vfs_call_sys_acl_free_qualifier(struct vfs_handle_struct *handle,
-                                       void *qualifier, SMB_ACL_TAG_T tagtype);
 ssize_t smb_vfs_call_getxattr(struct vfs_handle_struct *handle,
                              const char *path, const char *name, void *value,
                              size_t size);
@@ -842,25 +1154,6 @@ int smb_vfs_call_lsetxattr(struct vfs_handle_struct *handle, const char *path,
 int smb_vfs_call_fsetxattr(struct vfs_handle_struct *handle,
                           struct files_struct *fsp, const char *name,
                           const void *value, size_t size, int flags);
-int smb_vfs_call_aio_read(struct vfs_handle_struct *handle,
-                         struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_write(struct vfs_handle_struct *handle,
-                          struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-ssize_t smb_vfs_call_aio_return(struct vfs_handle_struct *handle,
-                               struct files_struct *fsp,
-                               SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_cancel(struct vfs_handle_struct *handle,
-                           struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_error(struct vfs_handle_struct *handle,
-                          struct files_struct *fsp,
-                          SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_fsync(struct vfs_handle_struct *handle,
-                          struct files_struct *fsp, int op,
-                          SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_suspend(struct vfs_handle_struct *handle,
-                            struct files_struct *fsp,
-                            const SMB_STRUCT_AIOCB * const aiocb[], int n,
-                            const struct timespec *timeout);
 bool smb_vfs_call_aio_force(struct vfs_handle_struct *handle,
                            struct files_struct *fsp);
 bool smb_vfs_call_is_offline(struct vfs_handle_struct *handle,
@@ -868,5 +1161,31 @@ bool smb_vfs_call_is_offline(struct vfs_handle_struct *handle,
                             SMB_STRUCT_STAT *sbuf);
 int smb_vfs_call_set_offline(struct vfs_handle_struct *handle,
                             const struct smb_filename *fname);
+NTSTATUS smb_vfs_call_durable_cookie(struct vfs_handle_struct *handle,
+                                    struct files_struct *fsp,
+                                    TALLOC_CTX *mem_ctx,
+                                    DATA_BLOB *cookie);
+NTSTATUS smb_vfs_call_durable_disconnect(struct vfs_handle_struct *handle,
+                                        struct files_struct *fsp,
+                                        const DATA_BLOB old_cookie,
+                                        TALLOC_CTX *mem_ctx,
+                                        DATA_BLOB *new_cookie);
+NTSTATUS smb_vfs_call_durable_reconnect(struct vfs_handle_struct *handle,
+                                       struct smb_request *smb1req,
+                                       struct smbXsrv_open *op,
+                                       const DATA_BLOB old_cookie,
+                                       TALLOC_CTX *mem_ctx,
+                                       struct files_struct **fsp,
+                                       DATA_BLOB *new_cookie);
+
+NTSTATUS smb_register_vfs(int version, const char *name,
+                         const struct vfs_fn_pointers *fns);
+void *vfs_add_fsp_extension_notype(vfs_handle_struct *handle,
+                                  files_struct *fsp, size_t ext_size,
+                                  void (*destroy_fn)(void *p_data));
+void vfs_remove_fsp_extension(vfs_handle_struct *handle, files_struct *fsp);
+void vfs_remove_all_fsp_extensions(struct files_struct *fsp);
+void *vfs_memctx_fsp_extension(vfs_handle_struct *handle, files_struct *fsp);
+void *vfs_fetch_fsp_extension(vfs_handle_struct *handle, files_struct *fsp);
 
 #endif /* _VFS_H */