summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-05 11:50:53 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-06 10:18:38 +0200
commit9b5c2ca14c120e3700cbb92b1ae19ea6da28a9af (patch)
tree1c1cff85f23836b0dee4d1c54e4f4002795d9c9a
parentc44d2e934c4b45971d537358aba60828164e9b91 (diff)
downloadsamba-9b5c2ca14c120e3700cbb92b1ae19ea6da28a9af.tar.gz
samba-9b5c2ca14c120e3700cbb92b1ae19ea6da28a9af.tar.bz2
samba-9b5c2ca14c120e3700cbb92b1ae19ea6da28a9af.zip
s3:include: move some prototypes (e.g. smb_register_vfs) to vfs.h
These are called from vfs modules, which should not depend on smbd/proto.h metze
-rw-r--r--source3/include/vfs.h10
-rw-r--r--source3/smbd/proto.h9
2 files changed, 10 insertions, 9 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index f9641d6f63..7ce364a51b 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -1070,4 +1070,14 @@ bool smb_vfs_call_is_offline(struct vfs_handle_struct *handle,
int smb_vfs_call_set_offline(struct vfs_handle_struct *handle,
const struct smb_filename *fname);
+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 */
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 03a09cd27e..b5a2ddf35f 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1133,16 +1133,7 @@ void sys_utmp_claim(const char *username, const char *hostname,
/* The following definitions come from smbd/vfs.c */
-NTSTATUS smb_register_vfs(int version, const char *name,
- const struct vfs_fn_pointers *fns);
bool vfs_init_custom(connection_struct *conn, const char *vfs_object);
-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);
bool smbd_vfs_init(connection_struct *conn);
NTSTATUS vfs_file_exist(connection_struct *conn, struct smb_filename *smb_fname);
ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count);