[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Dec 18 12:33:02 UTC 2017
The branch, master has been updated
via 4003736 vfs: Use static_decl_vfs in all VFS modules
via 679850e docs-xml/manpages: fix some trailing version strings from the doc.version change
from 416b7e9 source4/lib/socket/socket_ip.c set socket close on exec
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4003736a3d663e39beeabe3d3d9bdffdeca2b570
Author: Christof Schmitt <cs at samba.org>
Date: Fri Dec 15 15:32:12 2017 -0700
vfs: Use static_decl_vfs in all VFS modules
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Dec 18 13:32:00 CET 2017 on sn-devel-144
commit 679850e4b79a55758482fd08af765a4c27d9f739
Author: Björn Jacke <bjacke at samba.org>
Date: Wed Dec 13 01:32:48 2017 +0100
docs-xml/manpages: fix some trailing version strings from the doc.version change
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_aio_fork.8.xml | 2 +-
docs-xml/manpages/vfs_aio_pthread.8.xml | 2 +-
docs-xml/manpages/vfs_btrfs.8.xml | 2 +-
docs-xml/manpages/vfs_ceph.8.xml | 2 +-
docs-xml/manpages/vfs_crossrename.8.xml | 2 +-
docs-xml/manpages/vfs_glusterfs.8.xml | 2 +-
docs-xml/manpages/vfs_linux_xfs_sgid.8.xml | 2 +-
docs-xml/manpages/vfs_offline.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy2.8.xml | 2 +-
docs-xml/manpages/vfs_shell_snap.8.xml | 2 +-
docs-xml/manpages/vfs_snapper.8.xml | 2 +-
docs-xml/manpages/vfs_syncops.8.xml | 2 +-
docs-xml/manpages/vfs_time_audit.8.xml | 2 +-
docs-xml/manpages/vfs_tsmsm.8.xml | 2 +-
docs-xml/manpages/vfs_unityed_media.8.xml | 2 +-
docs-xml/manpages/vfs_worm.8.xml | 2 +-
docs-xml/manpages/vfs_zfsacl.8.xml | 2 +-
source3/modules/vfs_afsacl.c | 2 +-
source3/modules/vfs_aio_fork.c | 2 +-
source3/modules/vfs_aio_pthread.c | 2 +-
source3/modules/vfs_aixacl.c | 2 +-
source3/modules/vfs_aixacl2.c | 2 +-
source3/modules/vfs_btrfs.c | 2 +-
source3/modules/vfs_cacheprime.c | 2 +-
source3/modules/vfs_cap.c | 2 +-
source3/modules/vfs_ceph.c | 2 +-
source3/modules/vfs_commit.c | 2 +-
source3/modules/vfs_crossrename.c | 2 +-
source3/modules/vfs_default.c | 2 +-
source3/modules/vfs_default_quota.c | 2 +-
source3/modules/vfs_dfs_samba4.c | 2 +-
source3/modules/vfs_expand_msdfs.c | 2 +-
source3/modules/vfs_fake_acls.c | 2 +-
source3/modules/vfs_fake_perms.c | 2 +-
source3/modules/vfs_fileid.c | 2 +-
source3/modules/vfs_fruit.c | 2 +-
source3/modules/vfs_glusterfs.c | 2 +-
source3/modules/vfs_gpfs.c | 2 +-
source3/modules/vfs_hpuxacl.c | 1 +
source3/modules/vfs_hpuxacl.h | 2 --
source3/modules/vfs_linux_xfs_sgid.c | 2 +-
source3/modules/vfs_media_harmony.c | 2 +-
source3/modules/vfs_netatalk.c | 2 +-
source3/modules/vfs_nfs4acl_xattr.c | 2 +-
source3/modules/vfs_offline.c | 2 +-
source3/modules/vfs_posixacl.c | 2 +-
source3/modules/vfs_prealloc.c | 2 +-
source3/modules/vfs_preopen.c | 2 +-
source3/modules/vfs_readahead.c | 2 +-
source3/modules/vfs_recycle.c | 2 +-
source3/modules/vfs_shadow_copy.c | 2 +-
source3/modules/vfs_shadow_copy2.c | 2 +-
source3/modules/vfs_shell_snap.c | 2 +-
source3/modules/vfs_snapper.c | 2 +-
source3/modules/vfs_solarisacl.c | 2 +-
source3/modules/vfs_streams_depot.c | 2 +-
source3/modules/vfs_streams_xattr.c | 2 +-
source3/modules/vfs_time_audit.c | 2 +-
source3/modules/vfs_tru64acl.c | 2 +-
source3/modules/vfs_tsmsm.c | 2 +-
source3/modules/vfs_unityed_media.c | 2 +-
source3/modules/vfs_vxfs.c | 2 +-
source3/modules/vfs_worm.c | 2 +-
source3/modules/vfs_xattr_tdb.c | 2 +-
source3/modules/vfs_zfsacl.c | 2 +-
65 files changed, 64 insertions(+), 65 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_aio_fork.8.xml b/docs-xml/manpages/vfs_aio_fork.8.xml
index 65ffad2..c89fb03 100644
--- a/docs-xml/manpages/vfs_aio_fork.8.xml
+++ b/docs-xml/manpages/vfs_aio_fork.8.xml
@@ -69,7 +69,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_aio_pthread.8.xml b/docs-xml/manpages/vfs_aio_pthread.8.xml
index ec9d495..efdfa13 100644
--- a/docs-xml/manpages/vfs_aio_pthread.8.xml
+++ b/docs-xml/manpages/vfs_aio_pthread.8.xml
@@ -103,7 +103,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_btrfs.8.xml b/docs-xml/manpages/vfs_btrfs.8.xml
index 24d7a18..eddead4 100644
--- a/docs-xml/manpages/vfs_btrfs.8.xml
+++ b/docs-xml/manpages/vfs_btrfs.8.xml
@@ -121,7 +121,7 @@
<title>VERSION</title>
<para>
- This man page is correct for version &doc.version;.3.0 of the Samba suite.
+ This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_ceph.8.xml b/docs-xml/manpages/vfs_ceph.8.xml
index 88c84c6..8470908 100644
--- a/docs-xml/manpages/vfs_ceph.8.xml
+++ b/docs-xml/manpages/vfs_ceph.8.xml
@@ -105,7 +105,7 @@
<title>VERSION</title>
<para>
- This man page is correct for version &doc.version;.2.0 of the Samba suite.
+ This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_crossrename.8.xml b/docs-xml/manpages/vfs_crossrename.8.xml
index 70308e8..6b9f9ea 100644
--- a/docs-xml/manpages/vfs_crossrename.8.xml
+++ b/docs-xml/manpages/vfs_crossrename.8.xml
@@ -101,7 +101,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml
index b88c2ce..16ee791 100644
--- a/docs-xml/manpages/vfs_glusterfs.8.xml
+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
@@ -165,7 +165,7 @@
<title>VERSION</title>
<para>
- This man page is correct for version &doc.version;.6.0 of the Samba suite.
+ This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
index d97986e..25b5b00 100644
--- a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
+++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
@@ -57,7 +57,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.1.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_offline.8.xml b/docs-xml/manpages/vfs_offline.8.xml
index 5a6a51b..25e5c6d 100644
--- a/docs-xml/manpages/vfs_offline.8.xml
+++ b/docs-xml/manpages/vfs_offline.8.xml
@@ -55,7 +55,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.4 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml
index 478824e..1ce694d 100644
--- a/docs-xml/manpages/vfs_shadow_copy2.8.xml
+++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml
@@ -477,7 +477,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_shell_snap.8.xml b/docs-xml/manpages/vfs_shell_snap.8.xml
index a0a4885..48421d1 100644
--- a/docs-xml/manpages/vfs_shell_snap.8.xml
+++ b/docs-xml/manpages/vfs_shell_snap.8.xml
@@ -138,7 +138,7 @@
<title>VERSION</title>
<para>
- This man page is correct for version &doc.version;.2.0 of the Samba suite.
+ This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_snapper.8.xml b/docs-xml/manpages/vfs_snapper.8.xml
index 9709e20..dab058d 100644
--- a/docs-xml/manpages/vfs_snapper.8.xml
+++ b/docs-xml/manpages/vfs_snapper.8.xml
@@ -107,7 +107,7 @@
<title>VERSION</title>
<para>
- This man page is correct for version &doc.version;.3.0 of the Samba suite.
+ This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_syncops.8.xml b/docs-xml/manpages/vfs_syncops.8.xml
index 5d98b60..ea315d6 100644
--- a/docs-xml/manpages/vfs_syncops.8.xml
+++ b/docs-xml/manpages/vfs_syncops.8.xml
@@ -82,7 +82,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.1.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_time_audit.8.xml b/docs-xml/manpages/vfs_time_audit.8.xml
index 5b68380..fac1d1b 100644
--- a/docs-xml/manpages/vfs_time_audit.8.xml
+++ b/docs-xml/manpages/vfs_time_audit.8.xml
@@ -81,7 +81,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_tsmsm.8.xml b/docs-xml/manpages/vfs_tsmsm.8.xml
index 41e7118..6977c6b 100644
--- a/docs-xml/manpages/vfs_tsmsm.8.xml
+++ b/docs-xml/manpages/vfs_tsmsm.8.xml
@@ -119,7 +119,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_unityed_media.8.xml b/docs-xml/manpages/vfs_unityed_media.8.xml
index 071e438..408472e 100644
--- a/docs-xml/manpages/vfs_unityed_media.8.xml
+++ b/docs-xml/manpages/vfs_unityed_media.8.xml
@@ -98,7 +98,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.2 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_worm.8.xml b/docs-xml/manpages/vfs_worm.8.xml
index 9b2a81c..24a3965 100644
--- a/docs-xml/manpages/vfs_worm.8.xml
+++ b/docs-xml/manpages/vfs_worm.8.xml
@@ -76,7 +76,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.2 of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/vfs_zfsacl.8.xml b/docs-xml/manpages/vfs_zfsacl.8.xml
index 6803bef..650d314 100644
--- a/docs-xml/manpages/vfs_zfsacl.8.xml
+++ b/docs-xml/manpages/vfs_zfsacl.8.xml
@@ -144,7 +144,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version;.0.x of the Samba suite.
+ <para>This man page is correct for version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index ce789f0..54c9344 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -1111,7 +1111,7 @@ static struct vfs_fn_pointers vfs_afsacl_fns = {
.sys_acl_blob_get_fd_fn = afsacl_sys_acl_blob_get_fd
};
-NTSTATUS vfs_afsacl_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_afsacl_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "afsacl",
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index a0b1429..5ad2dce 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -927,7 +927,7 @@ static struct vfs_fn_pointers vfs_aio_fork_fns = {
.fsync_recv_fn = aio_fork_fsync_recv,
};
-NTSTATUS vfs_aio_fork_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_aio_fork_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c
index 1d9346c..d78dd11 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -496,7 +496,7 @@ static struct vfs_fn_pointers vfs_aio_pthread_fns = {
#endif
};
-NTSTATUS vfs_aio_pthread_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_aio_pthread_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index f6c42cb..86be759 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -190,7 +190,7 @@ static struct vfs_fn_pointers vfs_aixacl_fns = {
.sys_acl_delete_def_file_fn = aixacl_sys_acl_delete_def_file,
};
-NTSTATUS vfs_aixacl_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_aixacl_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "aixacl",
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 2e4b61e..d0cd2c1 100644
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -566,7 +566,7 @@ static struct vfs_fn_pointers vfs_aixacl2_fns = {
.sys_acl_delete_def_file_fn = aixjfs2_sys_acl_delete_def_file
};
-NTSTATUS vfs_aixacl2_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_aixacl2_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, AIXACL2_MODULE_NAME,
diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
index 13fd5e3..775e5f0 100644
--- a/source3/modules/vfs_btrfs.c
+++ b/source3/modules/vfs_btrfs.c
@@ -837,7 +837,7 @@ static struct vfs_fn_pointers btrfs_fns = {
.snap_delete_fn = btrfs_snap_delete,
};
-NTSTATUS vfs_btrfs_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_btrfs_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c
index f06ece6..5a8b8e0 100644
--- a/source3/modules/vfs_cacheprime.c
+++ b/source3/modules/vfs_cacheprime.c
@@ -189,7 +189,7 @@ static struct vfs_fn_pointers vfs_cacheprime_fns = {
* -------------------------------------------------------------------------
*/
-NTSTATUS vfs_cacheprime_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_cacheprime_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, MODULE,
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index e4d30cb..0684c79 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -1069,7 +1069,7 @@ static struct vfs_fn_pointers vfs_cap_fns = {
.fsetxattr_fn = cap_fsetxattr
};
-NTSTATUS vfs_cap_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_cap_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "cap",
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 9abd321..b4a7cee 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1474,7 +1474,7 @@ static struct vfs_fn_pointers ceph_fns = {
.aio_force_fn = cephwrap_aio_force,
};
-NTSTATUS vfs_ceph_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_ceph_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index 872b40b..aa9c87d 100644
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -403,7 +403,7 @@ static struct vfs_fn_pointers vfs_commit_fns = {
.ftruncate_fn = commit_ftruncate
};
-NTSTATUS vfs_commit_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_commit_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, MODULE,
diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index 4daa82c..f1cae9a 100644
--- a/source3/modules/vfs_crossrename.c
+++ b/source3/modules/vfs_crossrename.c
@@ -198,7 +198,7 @@ static struct vfs_fn_pointers vfs_crossrename_fns = {
.rename_fn = crossrename_rename
};
-NTSTATUS vfs_crossrename_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_crossrename_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, MODULE,
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 3379493..073c790 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3152,7 +3152,7 @@ static struct vfs_fn_pointers vfs_default_fns = {
.durable_reconnect_fn = vfswrap_durable_reconnect,
};
-NTSTATUS vfs_default_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_default_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_default_quota.c b/source3/modules/vfs_default_quota.c
index c27681a..326eb8c 100644
--- a/source3/modules/vfs_default_quota.c
+++ b/source3/modules/vfs_default_quota.c
@@ -228,7 +228,7 @@ static struct vfs_fn_pointers vfs_default_quota_fns = {
.set_quota_fn = default_quota_set_quota
};
-NTSTATUS vfs_default_quota_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_default_quota_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, DEFAULT_QUOTA_NAME,
diff --git a/source3/modules/vfs_dfs_samba4.c b/source3/modules/vfs_dfs_samba4.c
index 0bf1a29..d7f4edf 100644
--- a/source3/modules/vfs_dfs_samba4.c
+++ b/source3/modules/vfs_dfs_samba4.c
@@ -135,7 +135,7 @@ static struct vfs_fn_pointers vfs_dfs_samba4_fns = {
.get_dfs_referrals_fn = dfs_samba4_get_referrals,
};
-NTSTATUS vfs_dfs_samba4_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_dfs_samba4_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 4cabc8f..598da08 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -228,7 +228,7 @@ static struct vfs_fn_pointers vfs_expand_msdfs_fns = {
.readlink_fn = expand_msdfs_readlink
};
-NTSTATUS vfs_expand_msdfs_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_expand_msdfs_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "expand_msdfs",
diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index 0f539d1..e6983d4 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -538,7 +538,7 @@ static struct vfs_fn_pointers vfs_fake_acls_fns = {
};
-NTSTATUS vfs_fake_acls_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_fake_acls_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_acls",
diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 299bb48..0089186 100644
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -100,7 +100,7 @@ static struct vfs_fn_pointers vfs_fake_perms_fns = {
.fstat_fn = fake_perms_fstat
};
-NTSTATUS vfs_fake_perms_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_fake_perms_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_perms",
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index bb0a79c..a7c4a49 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -258,7 +258,7 @@ static struct vfs_fn_pointers vfs_fileid_fns = {
.file_id_create_fn = fileid_file_id_create
};
-NTSTATUS vfs_fileid_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_fileid_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 6a47857..67dd571 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -6038,7 +6038,7 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
.fset_nt_acl_fn = fruit_fset_nt_acl,
};
-NTSTATUS vfs_fruit_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_fruit_init(TALLOC_CTX *ctx)
{
NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fruit",
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index cffab7b..953c46a 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1523,7 +1523,7 @@ static struct vfs_fn_pointers glusterfs_fns = {
.durable_reconnect_fn = NULL,
};
-NTSTATUS vfs_glusterfs_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_glusterfs_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index e94c9cc..a0fd48f 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -2598,7 +2598,7 @@ static struct vfs_fn_pointers vfs_gpfs_fns = {
.ftruncate_fn = vfs_gpfs_ftruncate
};
-NTSTATUS vfs_gpfs_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_gpfs_init(TALLOC_CTX *ctx)
{
int ret;
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index 53e0ad6..42a2ab0 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -1167,6 +1167,7 @@ static struct vfs_fn_pointers hpuxacl_fns = {
.sys_acl_delete_def_file_fn = hpuxacl_sys_acl_delete_def_file,
--
Samba Shared Repository
More information about the samba-cvs
mailing list