Use NTSTATUS as return value for smb_register_*() functions and init_module()

function. Patch by metze with some minor modifications.
(This used to be commit bc4b51bcb2daa7271c884cb83bf8bdba6d3a9b6d)

6 files changed, 12 insertions, 12 deletions

diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index fa9bf67a67..4f9dc1b1e4 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -270,7 +270,7 @@ static int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode)
 	return result;
 }
 
-int vfs_audit_init(void)
+NTSTATUS vfs_audit_init(void)
 {
-	return smb_register_vfs("audit", audit_init, SMB_VFS_INTERFACE_VERSION);
+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "audit", audit_init);
 }
diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c
index f60acab36a..ef30ca7027 100644
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -310,7 +310,7 @@ static int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode)
 	return result;
 }
 
-int vfs_extd_audit_init(void)
+NTSTATUS vfs_extd_audit_init(void)
 {
-	return smb_register_vfs("extd_audit", audit_init, SMB_VFS_INTERFACE_VERSION);
+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "extd_audit", audit_init);
 }
diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 121a99a451..3a18fbb730 100644
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -281,7 +281,7 @@ static vfs_op_tuple *fake_perms_init(const struct vfs_ops *def_vfs_ops,
 	return fake_perms_ops;
 }
 
-int vfs_fake_perms_init(void)
+NTSTATUS vfs_fake_perms_init(void)
 {
-	return smb_register_vfs("fake_perms", fake_perms_init, SMB_VFS_INTERFACE_VERSION);
+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_perms", fake_perms_init);
 }
diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index c9e3cde621..718bc2a35c 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -421,7 +421,7 @@ static vfs_op_tuple *netatalk_init(const struct vfs_ops *def_vfs_ops,
 	return atalk_ops;
 }
 
-int vfs_netatalk_init(void)
+NTSTATUS vfs_netatalk_init(void)
 {
-	return smb_register_vfs("netatalk", netatalk_init, SMB_VFS_INTERFACE_VERSION);
+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "netatalk", netatalk_init);
 }
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 85ce257c02..87dea944ac 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -603,7 +603,7 @@ done:
 	return rc;
 }
 
-int vfs_recycle_init(void)
-{
-	return smb_register_vfs("recycle", recycle_init, SMB_VFS_INTERFACE_VERSION);
+NTSTATUS vfs_recycle_init(void)
+{  
+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "recycle", recycle_init);
 }
diff --git a/source3/modules/weird.c b/source3/modules/weird.c
index 377a68d518..444853f383 100644
--- a/source3/modules/weird.c
+++ b/source3/modules/weird.c
@@ -125,7 +125,7 @@ static size_t weird_push(void *cd, char **inbuf, size_t *inbytesleft,
 
 struct charset_functions weird_functions = {"WEIRD", weird_pull, weird_push};
 
-int charset_weird_init(void)
+NTSTATUS charset_weird_init(void)
 {
 	return smb_register_charset(&weird_functions);
 }