4 files changed, 5 insertions, 5 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 8f718e3d4d..cec15da1f6 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -27,7 +27,7 @@ static struct auth_init_function_entry *backends = NULL;
 
 static struct auth_init_function_entry *auth_find_backend_entry(const char *name);
 
-NTSTATUS smb_register_auth(uint16 version, const char *name, auth_init_function init)
+NTSTATUS smb_register_auth(int version, const char *name, auth_init_function init)
 {
 	struct auth_init_function_entry *entry = backends;
 
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index a8cc1f742a..7b44df193f 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -36,7 +36,7 @@ static void lazy_initialize_passdb(void)
 
 static struct pdb_init_function_entry *pdb_find_backend_entry(const char *name);
 
-NTSTATUS smb_register_passdb(uint16 version, const char *name, pdb_init_function init) 
+NTSTATUS smb_register_passdb(int version, const char *name, pdb_init_function init) 
 {
 	struct pdb_init_function_entry *entry = backends;
 
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index bdbd5b265c..4abc7b569c 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3237,10 +3237,10 @@ static NTSTATUS pdb_init_ldapsam_nua(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb
 	return NT_STATUS_OK;
 }
 
-int pdb_ldap_init(void)
+NTSTATUS pdb_ldap_init(void)
 {
 	smb_register_passdb(PASSDB_INTERFACE_VERSION, "ldapsam", pdb_init_ldapsam);
 	smb_register_passdb(PASSDB_INTERFACE_VERSION, "ldapsam_compat", pdb_init_ldapsam_compat);
 	smb_register_passdb(PASSDB_INTERFACE_VERSION, "ldapsam_nua", pdb_init_ldapsam_nua);
-	return True;
+	return NT_STATUS_OK;
 }
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index e33a8ccbe7..5fcf9a575e 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -153,7 +153,7 @@ static struct vfs_init_function_entry *vfs_find_backend_entry(const char *name)
    return NULL;
 }
 
-NTSTATUS smb_register_vfs(uint16 version, const char *name, vfs_op_tuple *(*init)(const struct vfs_ops *, struct smb_vfs_handle_struct *))
+NTSTATUS smb_register_vfs(int version, const char *name, vfs_op_tuple *(*init)(const struct vfs_ops *, struct smb_vfs_handle_struct *))
 {
    struct vfs_init_function_entry *entry = backends;